From 0c8e26466862cb61ccbc7995778e02175186926f Mon Sep 17 00:00:00 2001 From: James White Date: Sun, 20 Aug 2017 13:38:24 +0100 Subject: [PATCH] Fixed: Bulk UI cleanup, fixes and consistency improvements (#1959) --- .../Checks/AppDataLocationCheck.cs | 6 +- .../HealthCheck/Checks/DownloadClientCheck.cs | 4 +- .../HealthCheck/Checks/DroneFactoryCheck.cs | 8 +- .../Checks/ImportMechanismCheck.cs | 16 +- .../HealthCheck/Checks/IndexerRssCheck.cs | 6 +- .../HealthCheck/Checks/IndexerSearchCheck.cs | 6 +- .../HealthCheck/Checks/IndexerStatusCheck.cs | 4 +- .../HealthCheck/Checks/MonoVersionCheck.cs | 16 +- .../HealthCheck/Checks/ProxyCheck.cs | 10 +- .../HealthCheck/Checks/RootFolderCheck.cs | 4 +- .../HealthCheck/Checks/UpdateCheck.cs | 8 +- .../Notifications/Boxcar/BoxcarSettings.cs | 4 +- .../CustomScript/CustomScriptSettings.cs | 4 +- .../Notifications/Email/EmailSettings.cs | 4 +- .../MediaBrowser/MediaBrowserSettings.cs | 6 +- .../Notifications/Plex/PlexServerSettings.cs | 4 +- .../PushBullet/PushBulletSettings.cs | 8 +- .../Pushalot/PushalotSettings.cs | 4 +- .../Pushover/PushoverSettings.cs | 8 +- .../Notifications/Slack/SlackSettings.cs | 8 +- .../Synology/SynologyIndexerSettings.cs | 4 +- .../Telegram/TelegramSettings.cs | 4 +- .../Notifications/Twitter/TwitterSettings.cs | 12 +- .../Notifications/Webhook/WebhookSettings.cs | 4 +- .../Notifications/Xbmc/XbmcSettings.cs | 10 +- src/UI/Activity/ActivityLayoutTemplate.hbs | 2 +- src/UI/Activity/Blacklist/BlacklistLayout.js | 2 +- .../Blacklist/BlacklistLayoutTemplate.hbs | 6 +- .../BlacklistDetailsLayoutTemplate.hbs | 12 +- .../Details/BlacklistDetailsViewTemplate.hbs | 18 +- .../Details/HistoryDetailsLayoutTemplate.hbs | 18 +- .../Details/HistoryDetailsViewTemplate.hbs | 180 ++++++----- src/UI/Activity/History/HistoryLayout.js | 2 +- .../History/HistoryLayoutTemplate.hbs | 6 +- .../Queue/QueueActionsCellTemplate.hbs | 8 +- src/UI/Activity/Queue/QueueLayout.js | 2 +- src/UI/Activity/Queue/QueueLayoutTemplate.hbs | 6 +- .../Queue/QueueStatusCellTemplate.hbs | 2 +- .../Queue/RemoveFromQueueViewTemplate.hbs | 45 ++- src/UI/AddMovies/AddMoviesLayoutTemplate.hbs | 47 +-- src/UI/AddMovies/AddMoviesView.js | 2 +- src/UI/AddMovies/AddMoviesViewTemplate.hbs | 52 +-- .../BulkImportProfileCellTemplate.hbs | 2 +- src/UI/AddMovies/BulkImport/BulkImportView.js | 2 +- .../BulkImport/BulkImportViewTemplate.hbs | 23 +- .../BulkImport/EmptyViewTemplate.hbs | 2 +- .../BulkImport/MoviePathTemplate.hbs | 11 +- .../BulkImport/QualityCellTemplate.hbs | 4 +- .../AddMovies/DiscoverEmptyViewTemplate.hbs | 5 +- .../DiscoverableListDropdownViewTemplate.hbs | 2 +- src/UI/AddMovies/EmptyViewTemplate.hbs | 2 +- src/UI/AddMovies/ErrorViewTemplate.hbs | 6 +- ...AddExistingMovieCollectionViewTemplate.hbs | 4 +- .../AddFromListCollectionViewTemplate.hbs | 5 +- src/UI/AddMovies/List/AddFromListView.js | 2 +- .../List/AddFromListViewTemplate.hbs | 30 +- src/UI/AddMovies/List/ListItemView.js | 4 +- .../AddMovies/List/ListItemViewTemplate.hbs | 2 +- .../MinimumAvailabilityTooltipTemplate.hbs | 10 + .../MinimumavailabilityTooltipTemplate.hbs | 10 - .../AddMovies/MonitoringTooltipTemplate.hbs | 6 +- src/UI/AddMovies/NotFoundViewTemplate.hbs | 5 +- .../RootFolderCollectionViewTemplate.hbs | 10 +- .../RootFolderItemViewTemplate.hbs | 2 +- .../RootFolders/RootFolderLayoutTemplate.hbs | 29 +- .../RootFolderSelectionPartial.hbs | 8 +- src/UI/AddMovies/SearchResultView.js | 8 +- src/UI/AddMovies/SearchResultViewTemplate.hbs | 106 +++---- .../StartingSeasonSelectionPartial.hbs | 3 - src/UI/AddMovies/addMovies.less | 6 +- src/UI/Calendar/CalendarFeedViewTemplate.hbs | 109 ++++--- src/UI/Calendar/CalendarLayout.js | 8 +- src/UI/Calendar/CalendarLayoutTemplate.hbs | 36 ++- src/UI/Calendar/CalendarView.js | 4 +- src/UI/Calendar/UpcomingItemViewTemplate.hbs | 14 +- src/UI/Calendar/calendar.less | 4 + src/UI/Cells/EditionCellTemplate.hbs | 2 +- src/UI/Cells/QualityCellTemplate.hbs | 2 +- src/UI/Content/Overrides/bootstrap.less | 15 +- src/UI/Content/Overrides/browser.less | 1 - src/UI/Content/font.less | 9 +- src/UI/Content/fonts/opensans-light.woff2 | Bin 0 -> 14488 bytes src/UI/Content/fonts/opensans-regular.woff2 | Bin 0 -> 13964 bytes src/UI/Content/fonts/opensans-semibold.woff2 | Bin 0 -> 14468 bytes src/UI/Content/fonts/ubuntumono-regular.woff2 | Bin 0 -> 23120 bytes src/UI/Content/navbar.less | 4 +- src/UI/Content/theme.less | 5 +- src/UI/Form/CaptchaTemplate.hbs | 16 +- src/UI/Form/CheckboxTemplate.hbs | 9 +- src/UI/Form/FormHelpPartial.hbs | 6 +- src/UI/Form/HiddenTemplate.hbs | 2 +- src/UI/Form/PasswordTemplate.hbs | 3 +- src/UI/Form/PathTemplate.hbs | 3 +- src/UI/Form/SelectTemplate.hbs | 1 - src/UI/Form/TagTemplate.hbs | 8 +- src/UI/Form/TextboxTemplate.hbs | 3 +- src/UI/Form/UrlTemplate.hbs | 3 +- src/UI/Hotkeys/HotkeysViewTemplate.hbs | 16 +- .../Folder/SelectFolderViewTemplate.hbs | 47 +-- .../ManualImportLayoutTemplate.hbs | 10 +- .../Movie/SelectMovieLayoutTemplate.hbs | 11 +- .../Quality/SelectQualityLayoutTemplate.hbs | 10 +- .../Quality/SelectQualityViewTemplate.hbs | 10 +- .../ManualImportSummaryViewTemplate.hbs | 1 - src/UI/Movies/Delete/DeleteMovieTemplate.hbs | 45 ++- src/UI/Movies/Details/InfoViewTemplate.hbs | 2 + src/UI/Movies/Details/MoviesDetailsLayout.js | 2 +- .../Movies/Details/MoviesDetailsTemplate.hbs | 76 ++--- src/UI/Movies/Edit/EditMovieTemplate.hbs | 67 ++-- .../Editor/MovieEditorFooterViewTemplate.hbs | 36 +-- .../Editor/MovieEditorLayoutTemplate.hbs | 6 +- .../Organize/OrganizeFilesViewTemplate.hbs | 10 +- src/UI/Movies/Files/Edit/EditFileTemplate.hbs | 57 ++-- src/UI/Movies/Index/EmptyTemplate.hbs | 2 +- src/UI/Movies/Index/FooterViewTemplate.hbs | 40 ++- src/UI/Movies/Index/MoviesIndexLayout.js | 40 +-- .../Index/MoviesIndexLayoutTemplate.hbs | 6 +- .../SeriesOverviewItemViewTemplate.hbs | 43 ++- .../Posters/SeriesPostersItemViewTemplate.hbs | 32 +- src/UI/Movies/Search/ButtonsViewTemplate.hbs | 12 +- .../Movies/Search/NoResultsViewTemplate.hbs | 2 +- src/UI/Movies/movies.less | 8 +- src/UI/Navbar/NavbarLayoutTemplate.hbs | 120 ++++--- src/UI/Release/ForceDownloadViewTemplate.hbs | 21 +- src/UI/Release/ReleaseLayoutTemplate.hbs | 4 +- .../RenamePreviewFormatViewTemplate.hbs | 4 +- .../Rename/RenamePreviewItemViewTemplate.hbs | 16 +- src/UI/Rename/RenamePreviewLayoutTemplate.hbs | 18 +- ...ownloadClientAddCollectionViewTemplate.hbs | 2 +- .../Add/DownloadClientAddItemViewTemplate.hbs | 38 +-- .../DownloadClientDeleteViewTemplate.hbs | 4 +- .../DownloadClientCollectionViewTemplate.hbs | 6 +- .../DownloadClientItemViewTemplate.hbs | 7 +- .../DownloadClientSettingsModel.js | 6 +- .../DownloadHandlingViewTemplate.hbs | 45 +-- .../DroneFactory/DroneFactoryViewTemplate.hbs | 23 +- .../Edit/DownloadClientEditViewTemplate.hbs | 27 +- ...emotePathMappingCollectionViewTemplate.hbs | 10 +- .../RemotePathMappingDeleteViewTemplate.hbs | 4 +- .../RemotePathMappingEditViewTemplate.hbs | 28 +- .../RemotePathMappingItemViewTemplate.hbs | 6 +- .../Settings/General/GeneralSettingsModel.js | 6 +- .../Settings/General/GeneralViewTemplate.hbs | 298 +++++++----------- .../Add/IndexerAddCollectionViewTemplate.hbs | 6 +- .../Add/IndexerAddItemViewTemplate.hbs | 38 +-- .../Delete/IndexerDeleteViewTemplate.hbs | 6 +- .../Indexers/Edit/IndexerEditViewTemplate.hbs | 44 ++- .../IndexerCollectionViewTemplate.hbs | 4 +- .../Indexers/IndexerItemViewTemplate.hbs | 1 - .../Settings/Indexers/IndexerSettingsModel.js | 6 +- .../Indexers/Options/IndexerOptionsView.js | 2 +- .../Options/IndexerOptionsViewTemplate.hbs | 86 ++--- .../Options/LeniencyTooltipTemplate.hbs | 26 +- .../RestrictionCollectionViewTemplate.hbs | 14 +- .../RestrictionDeleteViewTemplate.hbs | 4 +- .../RestrictionEditViewTemplate.hbs | 25 +- .../RestrictionItemViewTemplate.hbs | 24 +- .../FileManagementViewTemplate.hbs | 175 +++++----- .../MediaManagementLayoutTemplate.hbs | 6 +- .../MediaManagementSettingsModel.js | 6 +- .../Naming/Basic/BasicNamingViewTemplate.hbs | 73 +---- .../Naming/NamingViewTemplate.hbs | 200 ++---------- .../Permissions/PermissionsViewTemplate.hbs | 36 +-- .../Sorting/SortingViewTemplate.hbs | 87 ++--- .../Metadata/MetadataEditViewTemplate.hbs | 12 +- .../Metadata/MetadataLayoutTemplate.hbs | 2 +- .../NetImportAddCollectionViewTemplate.hbs | 28 +- .../Add/NetImportAddItemViewTemplate.hbs | 54 ++-- .../Delete/IndexerDeleteViewTemplate.hbs | 6 +- .../Edit/NetImportEditViewTemplate.hbs | 240 +++++++------- .../NetImport/ListSelectionPartial.hbs | 18 +- .../NetImport/NetImportCollectionView.hbs | 26 +- .../NetImport/NetImportItemViewTemplate.hbs | 19 +- src/UI/Settings/NetImport/NetImportLayout.js | 2 +- .../NetImport/NetImportLayoutTemplate.hbs | 11 +- .../NetImport/NetImportSettingsModel.js | 4 +- .../NetImport/Options/NetImportOptionsView.js | 2 +- .../Options/NetImportOptionsViewTemplate.hbs | 96 +++--- .../RestrictionCollectionViewTemplate.hbs | 12 +- .../RestrictionDeleteViewTemplate.hbs | 4 +- .../RestrictionEditViewTemplate.hbs | 26 +- .../RestrictionItemViewTemplate.hbs | 6 +- .../NotificationAddCollectionViewTemplate.hbs | 4 +- .../Add/NotificationAddItemViewTemplate.hbs | 38 ++- .../Delete/NotificationDeleteViewTemplate.hbs | 6 +- .../Edit/NotificationEditViewTemplate.hbs | 58 ++-- .../NotificationCollectionViewTemplate.hbs | 4 +- .../NotificationItemViewTemplate.hbs | 29 +- .../Delay/DelayProfileItemViewTemplate.hbs | 95 +++--- .../Delay/DelayProfileLayoutTemplate.hbs | 13 +- .../Delete/DelayProfileDeleteViewTemplate.hbs | 4 +- .../Edit/DelayProfileEditViewTemplate.hbs | 30 +- .../Profile/DeleteProfileViewTemplate.hbs | 2 +- .../Edit/EditProfileItemViewTemplate.hbs | 4 +- .../Edit/EditProfileLayoutTemplate.hbs | 22 +- .../Profile/Edit/EditProfileViewTemplate.hbs | 91 +++--- .../Profile/ProfileCollectionTemplate.hbs | 4 +- .../Profile/ProfileLayoutTemplate.hbs | 5 +- .../Settings/Profile/ProfileViewTemplate.hbs | 17 +- .../QualityDefinitionCollectionTemplate.hbs | 26 +- .../QualityDefinitionItemViewTemplate.hbs | 64 ++-- .../Quality/QualityLayoutTemplate.hbs | 2 +- src/UI/Settings/SettingsLayoutTemplate.hbs | 85 +++-- .../ThingyHeaderGroupViewTemplate.hbs | 2 +- src/UI/Settings/UI/UiViewTemplate.hbs | 28 +- src/UI/Settings/thingy.less | 2 +- .../FileBrowser/FileBrowserLayoutTemplate.hbs | 10 +- src/UI/Shared/Grid/PagerTemplate.hbs | 7 +- src/UI/Shared/NotFoundViewTemplate.hbs | 7 +- src/UI/Shared/NzbDroneController.js | 2 +- src/UI/Shared/SignalRBroadcaster.js | 2 +- src/UI/Shared/Toolbar/ButtonTemplate.hbs | 3 +- src/UI/Shared/Toolbar/RadioButtonTemplate.hbs | 4 +- .../SortingButtonCollectionViewTemplate.hbs | 4 +- .../Shared/Toolbar/ToolbarLayoutTemplate.hbs | 4 +- src/UI/System/Backup/BackupLayout.js | 4 +- src/UI/System/Backup/BackupLayoutTemplate.hbs | 4 +- src/UI/System/Backup/BackupTypeCell.js | 2 +- .../System/Info/About/AboutViewTemplate.hbs | 5 +- .../System/Info/DiskSpace/DiskSpaceLayout.js | 6 +- .../DiskSpace/DiskSpaceLayoutTemplate.hbs | 7 +- src/UI/System/Info/Health/HealthCell.js | 4 +- .../Info/Health/HealthLayoutTemplate.hbs | 3 +- .../Info/Health/HealthOkViewTemplate.hbs | 6 +- src/UI/System/Info/Health/HealthWikiCell.js | 4 +- .../Info/MoreInfo/MoreInfoViewTemplate.hbs | 44 ++- .../System/Info/SystemInfoLayoutTemplate.hbs | 3 - .../Logs/Files/LogFileLayoutTemplate.hbs | 8 +- .../Table/Details/LogDetailsViewTemplate.hbs | 4 +- src/UI/System/Logs/Table/LogLevelCell.js | 4 +- .../Logs/Table/LogsTableLayoutTemplate.hbs | 6 +- src/UI/System/SystemLayout.js | 4 +- src/UI/System/SystemLayoutTemplate.hbs | 16 +- src/UI/System/Task/TaskLayout.js | 2 +- src/UI/System/Task/TaskLayoutTemplate.hbs | 2 +- .../System/Update/UpdateItemViewTemplate.hbs | 10 +- src/UI/System/Update/UpdateLayoutTemplate.hbs | 2 +- src/UI/Wanted/ControlsColumnTemplate.hbs | 2 +- src/UI/Wanted/Cutoff/CutoffUnmetLayout.js | 8 +- .../Cutoff/CutoffUnmetLayoutTemplate.hbs | 6 +- src/UI/Wanted/Missing/MissingLayout.js | 32 +- .../Wanted/Missing/MissingLayoutTemplate.hbs | 6 +- src/UI/Wanted/WantedLayout.js | 2 +- src/UI/Wanted/WantedLayoutTemplate.hbs | 6 +- src/UI/index.html | 116 ++++--- src/UI/login.html | 74 ++--- src/UI/main.js | 10 +- 247 files changed, 2283 insertions(+), 2686 deletions(-) create mode 100644 src/UI/AddMovies/MinimumAvailabilityTooltipTemplate.hbs delete mode 100644 src/UI/AddMovies/MinimumavailabilityTooltipTemplate.hbs create mode 100644 src/UI/Content/fonts/opensans-light.woff2 create mode 100644 src/UI/Content/fonts/opensans-regular.woff2 create mode 100644 src/UI/Content/fonts/opensans-semibold.woff2 create mode 100644 src/UI/Content/fonts/ubuntumono-regular.woff2 diff --git a/src/NzbDrone.Core/HealthCheck/Checks/AppDataLocationCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/AppDataLocationCheck.cs index ad4f2db9e..2c48dedab 100644 --- a/src/NzbDrone.Core/HealthCheck/Checks/AppDataLocationCheck.cs +++ b/src/NzbDrone.Core/HealthCheck/Checks/AppDataLocationCheck.cs @@ -1,4 +1,4 @@ -using NzbDrone.Common.EnvironmentInfo; +using NzbDrone.Common.EnvironmentInfo; using NzbDrone.Common.Extensions; namespace NzbDrone.Core.HealthCheck.Checks @@ -11,13 +11,13 @@ namespace NzbDrone.Core.HealthCheck.Checks { _appFolderInfo = appFolderInfo; } - + public override HealthCheck Check() { if (_appFolderInfo.StartUpFolder.IsParentPath(_appFolderInfo.AppDataFolder) || _appFolderInfo.StartUpFolder.PathEquals(_appFolderInfo.AppDataFolder)) { - return new HealthCheck(GetType(), HealthCheckResult.Warning, "Updating will not be possible to prevent deleting AppData on Update"); + return new HealthCheck(GetType(), HealthCheckResult.Warning, "Updating will not be possible to prevent deleting AppData on update"); } return new HealthCheck(GetType()); diff --git a/src/NzbDrone.Core/HealthCheck/Checks/DownloadClientCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/DownloadClientCheck.cs index f82e37e1b..5109c0fc3 100644 --- a/src/NzbDrone.Core/HealthCheck/Checks/DownloadClientCheck.cs +++ b/src/NzbDrone.Core/HealthCheck/Checks/DownloadClientCheck.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Linq; using NLog; using NzbDrone.Core.Download; @@ -22,7 +22,7 @@ namespace NzbDrone.Core.HealthCheck.Checks if (!downloadClients.Any()) { - return new HealthCheck(GetType(), HealthCheckResult.Warning, "No download client is available"); + return new HealthCheck(GetType(), HealthCheckResult.Warning, "No download client is available."); } foreach (var downloadClient in downloadClients) diff --git a/src/NzbDrone.Core/HealthCheck/Checks/DroneFactoryCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/DroneFactoryCheck.cs index 338f8f921..016066398 100644 --- a/src/NzbDrone.Core/HealthCheck/Checks/DroneFactoryCheck.cs +++ b/src/NzbDrone.Core/HealthCheck/Checks/DroneFactoryCheck.cs @@ -1,4 +1,4 @@ -using NzbDrone.Common.Disk; +using NzbDrone.Common.Disk; using NzbDrone.Common.Extensions; using NzbDrone.Core.Configuration; @@ -26,12 +26,12 @@ namespace NzbDrone.Core.HealthCheck.Checks if (!_diskProvider.FolderExists(droneFactoryFolder)) { - return new HealthCheck(GetType(), HealthCheckResult.Error, "Drone factory folder does not exist"); + return new HealthCheck(GetType(), HealthCheckResult.Error, "Drone Factory folder does not exist."); } - + if (!_diskProvider.FolderWritable(droneFactoryFolder)) { - return new HealthCheck(GetType(), HealthCheckResult.Error, "Unable to write to drone factory folder"); + return new HealthCheck(GetType(), HealthCheckResult.Error, "Unable to write to Drone Factory folder"); } //Todo: Unable to import one or more files/folders from diff --git a/src/NzbDrone.Core/HealthCheck/Checks/ImportMechanismCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/ImportMechanismCheck.cs index 559202399..fd766b066 100644 --- a/src/NzbDrone.Core/HealthCheck/Checks/ImportMechanismCheck.cs +++ b/src/NzbDrone.Core/HealthCheck/Checks/ImportMechanismCheck.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using NzbDrone.Common.Disk; @@ -51,7 +51,7 @@ namespace NzbDrone.Core.HealthCheck.Checks // Migration helper logic if (!downloadClientIsLocalHost) { - return new HealthCheck(GetType(), HealthCheckResult.Warning, "Enable Completed Download Handling if possible (Multi-Computer unsupported)", "Migrating-to-Completed-Download-Handling#Unsupported-download-client-on-different-computer"); + return new HealthCheck(GetType(), HealthCheckResult.Warning, "Enable completed download handling if possible (Multi-Computer unsupported).", "Migrating-to-Completed-Download-Handling#Unsupported-download-client-on-different-computer"); } if (downloadClients.All(v => v.DownloadClient is Sabnzbd)) @@ -59,10 +59,10 @@ namespace NzbDrone.Core.HealthCheck.Checks // With Sabnzbd we can check if the category should be changed. if (downloadClientOutputInDroneFactory) { - return new HealthCheck(GetType(), HealthCheckResult.Warning, "Enable Completed Download Handling if possible (Sabnzbd - Conflicting Category)", "Migrating-to-Completed-Download-Handling#sabnzbd-conflicting-download-client-category"); + return new HealthCheck(GetType(), HealthCheckResult.Warning, "Enable completed download handling if possible (SABnzbd - conflicting category).", "Migrating-to-Completed-Download-Handling#sabnzbd-conflicting-download-client-category"); } - return new HealthCheck(GetType(), HealthCheckResult.Warning, "Enable Completed Download Handling if possible (Sabnzbd)", "Migrating-to-Completed-Download-Handling#sabnzbd-enable-completed-download-handling"); + return new HealthCheck(GetType(), HealthCheckResult.Warning, "Enable completed download handling if possible (SABnzbd).", "Migrating-to-Completed-Download-Handling#sabnzbd-enable-completed-download-handling"); } if (downloadClients.All(v => v.DownloadClient is Nzbget)) @@ -70,18 +70,18 @@ namespace NzbDrone.Core.HealthCheck.Checks // With Nzbget we can check if the category should be changed. if (downloadClientOutputInDroneFactory) { - return new HealthCheck(GetType(), HealthCheckResult.Warning, "Enable Completed Download Handling if possible (Nzbget - Conflicting Category)", "Migrating-to-Completed-Download-Handling#nzbget-conflicting-download-client-category"); + return new HealthCheck(GetType(), HealthCheckResult.Warning, "Enable completed download handling if possible (NZBGet - conflicting category).", "Migrating-to-Completed-Download-Handling#nzbget-conflicting-download-client-category"); } - return new HealthCheck(GetType(), HealthCheckResult.Warning, "Enable Completed Download Handling if possible (Nzbget)", "Migrating-to-Completed-Download-Handling#nzbget-enable-completed-download-handling"); + return new HealthCheck(GetType(), HealthCheckResult.Warning, "Enable completed download handling if possible (NZBGet).", "Migrating-to-Completed-Download-Handling#nzbget-enable-completed-download-handling"); } - return new HealthCheck(GetType(), HealthCheckResult.Warning, "Enable Completed Download Handling if possible", "Migrating-to-Completed-Download-Handling"); + return new HealthCheck(GetType(), HealthCheckResult.Warning, "Enable completed download handling if possible.", "Migrating-to-Completed-Download-Handling"); } if (!_configService.EnableCompletedDownloadHandling && droneFactoryFolder.IsEmpty) { - return new HealthCheck(GetType(), HealthCheckResult.Warning, "Enable Completed Download Handling or configure Drone factory"); + return new HealthCheck(GetType(), HealthCheckResult.Warning, "Enable completed download handling or configure Drone Factory."); } return new HealthCheck(GetType()); diff --git a/src/NzbDrone.Core/HealthCheck/Checks/IndexerRssCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/IndexerRssCheck.cs index 815657ba1..1ce284b58 100644 --- a/src/NzbDrone.Core/HealthCheck/Checks/IndexerRssCheck.cs +++ b/src/NzbDrone.Core/HealthCheck/Checks/IndexerRssCheck.cs @@ -1,4 +1,4 @@ -using System.Linq; +using System.Linq; using NzbDrone.Common.Extensions; using NzbDrone.Core.Indexers; @@ -19,14 +19,14 @@ namespace NzbDrone.Core.HealthCheck.Checks if (enabled.Empty()) { - return new HealthCheck(GetType(), HealthCheckResult.Error, "No indexers available with RSS sync enabled, Radarr will not grab new releases automatically"); + return new HealthCheck(GetType(), HealthCheckResult.Error, "No indexers available with RSS sync enabled, Radarr will not grab new releases automatically."); } var active = _indexerFactory.RssEnabled(true); if (active.Empty()) { - return new HealthCheck(GetType(), HealthCheckResult.Warning, "All rss-capable indexers are temporarily unavailable due to recent indexer errors"); + return new HealthCheck(GetType(), HealthCheckResult.Warning, "All RSS capable indexers are temporarily unavailable due to recent indexer errors."); } return new HealthCheck(GetType()); diff --git a/src/NzbDrone.Core/HealthCheck/Checks/IndexerSearchCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/IndexerSearchCheck.cs index 24826a7c1..1a8741170 100644 --- a/src/NzbDrone.Core/HealthCheck/Checks/IndexerSearchCheck.cs +++ b/src/NzbDrone.Core/HealthCheck/Checks/IndexerSearchCheck.cs @@ -1,4 +1,4 @@ -using System.Linq; +using System.Linq; using NzbDrone.Common.Extensions; using NzbDrone.Core.Indexers; @@ -19,14 +19,14 @@ namespace NzbDrone.Core.HealthCheck.Checks if (enabled.Empty()) { - return new HealthCheck(GetType(), HealthCheckResult.Warning, "No indexers available with Search enabled, Radarr will not provide any search results"); + return new HealthCheck(GetType(), HealthCheckResult.Warning, "No indexers available with search enabled, Radarr will not provide any search results."); } var active = _indexerFactory.SearchEnabled(true); if (active.Empty()) { - return new HealthCheck(GetType(), HealthCheckResult.Warning, "All search-capable indexers are temporarily unavailable due to recent indexer errors"); + return new HealthCheck(GetType(), HealthCheckResult.Warning, "All search-capable indexers are temporarily unavailable due to recent indexer errors."); } return new HealthCheck(GetType()); diff --git a/src/NzbDrone.Core/HealthCheck/Checks/IndexerStatusCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/IndexerStatusCheck.cs index 29eadb180..e9656507b 100644 --- a/src/NzbDrone.Core/HealthCheck/Checks/IndexerStatusCheck.cs +++ b/src/NzbDrone.Core/HealthCheck/Checks/IndexerStatusCheck.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Linq; using NzbDrone.Common.Extensions; using NzbDrone.Core.Indexers; @@ -33,7 +33,7 @@ namespace NzbDrone.Core.HealthCheck.Checks if (backOffIndexers.Count == enabledIndexers.Count) { - return new HealthCheck(GetType(), HealthCheckResult.Error, "All indexers are unavailable due to failures", "#indexers-are-unavailable-due-to-failures"); + return new HealthCheck(GetType(), HealthCheckResult.Error, "All indexers are unavailable due to failures.", "#indexers-are-unavailable-due-to-failures"); } return new HealthCheck(GetType(), HealthCheckResult.Warning, string.Format("Indexers unavailable due to failures: {0}", string.Join(", ", backOffIndexers.Select(v => v.Indexer.Definition.Name))), "#indexers-are-unavailable-due-to-failures"); diff --git a/src/NzbDrone.Core/HealthCheck/Checks/MonoVersionCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/MonoVersionCheck.cs index f74156cb3..1cf69a035 100644 --- a/src/NzbDrone.Core/HealthCheck/Checks/MonoVersionCheck.cs +++ b/src/NzbDrone.Core/HealthCheck/Checks/MonoVersionCheck.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Linq; using System.Reflection; using System.Text.RegularExpressions; @@ -35,24 +35,24 @@ namespace NzbDrone.Core.HealthCheck.Checks if (version == new Version(3, 4, 0) && HasMonoBug18599()) { - _logger.Debug("mono version 3.4.0, checking for mono bug #18599 returned positive."); - return new HealthCheck(GetType(), HealthCheckResult.Error, "your mono version 3.4.0 has a critical bug, you should upgrade to a higher version"); + _logger.Debug("Mono version 3.4.0, checking for mono bug #18599 returned positive."); + return new HealthCheck(GetType(), HealthCheckResult.Error, "your Mono version 3.4.0 has a critical bug, you should upgrade to a higher version."); } if (version == new Version(4, 4, 0) || version == new Version(4, 4, 1)) { - _logger.Debug("mono version {0}", version); - return new HealthCheck(GetType(), HealthCheckResult.Error, $"your mono version {version} has a bug that causes issues connecting to indexers/download clients"); + _logger.Debug("Mono version {0}", version); + return new HealthCheck(GetType(), HealthCheckResult.Error, $"your Mono version {version} has a bug that causes issues connecting to indexers/download clients."); } if (version >= new Version(3, 10)) { - _logger.Debug("mono version is 3.10 or better: {0}", version.ToString()); + _logger.Debug("Mono version is 3.10 or better: {0}.", version.ToString()); return new HealthCheck(GetType()); } } - return new HealthCheck(GetType(), HealthCheckResult.Warning, "mono version is less than 3.10, upgrade for improved stability"); + return new HealthCheck(GetType(), HealthCheckResult.Warning, "Mono version is less than 3.10, upgrade for improved stability."); } public override bool CheckOnConfigChange => false; @@ -61,7 +61,7 @@ namespace NzbDrone.Core.HealthCheck.Checks private bool HasMonoBug18599() { - _logger.Debug("mono version 3.4.0, checking for mono bug #18599."); + _logger.Debug("Mono version 3.4.0, checking for mono bug #18599."); var numberFormatterType = Type.GetType("System.NumberFormatter"); if (numberFormatterType == null) diff --git a/src/NzbDrone.Core/HealthCheck/Checks/ProxyCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/ProxyCheck.cs index 1732c549e..b7818c4ea 100644 --- a/src/NzbDrone.Core/HealthCheck/Checks/ProxyCheck.cs +++ b/src/NzbDrone.Core/HealthCheck/Checks/ProxyCheck.cs @@ -1,4 +1,4 @@ -using NLog; +using NLog; using NzbDrone.Common.Http; using NzbDrone.Core.Configuration; using System; @@ -32,7 +32,7 @@ namespace NzbDrone.Core.HealthCheck.Checks var addresses = Dns.GetHostAddresses(_configService.ProxyHostname); if(!addresses.Any()) { - return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format("Failed to resolve the IP Address for the Configured Proxy Host {0}", _configService.ProxyHostname)); + return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format("Failed to resolve the IP address for the configured proxy host {0}.", _configService.ProxyHostname)); } var request = _cloudRequestBuilder.Create() @@ -43,17 +43,17 @@ namespace NzbDrone.Core.HealthCheck.Checks { var response = _client.Execute(request); - // We only care about 400 responses, other error codes can be ignored + // We only care about 400 responses, other error codes can be ignored if (response.StatusCode == HttpStatusCode.BadRequest) { _logger.Error("Proxy Health Check failed: {0}", response.StatusCode); - return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format("Failed to test proxy: StatusCode {1}", request.Url, response.StatusCode)); + return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format("Failed to test proxy: StatusCode {1}.", request.Url, response.StatusCode)); } } catch (Exception ex) { _logger.Error(ex, "Proxy Health Check failed: {0}", ex.Message); - return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format("Failed to test proxy: {1}", request.Url, ex.Message)); + return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format("Failed to test proxy: {1}.", request.Url, ex.Message)); } } diff --git a/src/NzbDrone.Core/HealthCheck/Checks/RootFolderCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/RootFolderCheck.cs index d7cb3f7d1..637405045 100644 --- a/src/NzbDrone.Core/HealthCheck/Checks/RootFolderCheck.cs +++ b/src/NzbDrone.Core/HealthCheck/Checks/RootFolderCheck.cs @@ -1,4 +1,4 @@ -using System.Linq; +using System.Linq; using NzbDrone.Common.Disk; using NzbDrone.Core.Tv; @@ -30,7 +30,7 @@ namespace NzbDrone.Core.HealthCheck.Checks return new HealthCheck(GetType(), HealthCheckResult.Error, "Missing root folder: " + missingRootFolders.First(), "#missing-root-folder"); } - var message = string.Format("Multiple root folders are missing: {0}", string.Join(" | ", missingRootFolders)); + var message = string.Format("Multiple root folders are missing: {0}.", string.Join(" | ", missingRootFolders)); return new HealthCheck(GetType(), HealthCheckResult.Error, message, "#missing-root-folder"); } diff --git a/src/NzbDrone.Core/HealthCheck/Checks/UpdateCheck.cs b/src/NzbDrone.Core/HealthCheck/Checks/UpdateCheck.cs index c0d7a5c31..929be256b 100644 --- a/src/NzbDrone.Core/HealthCheck/Checks/UpdateCheck.cs +++ b/src/NzbDrone.Core/HealthCheck/Checks/UpdateCheck.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.IO; using NzbDrone.Common.Disk; using NzbDrone.Common.EnvironmentInfo; @@ -45,14 +45,14 @@ namespace NzbDrone.Core.HealthCheck.Checks { return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format("Cannot install update because startup folder '{0}' is not writable by the user '{1}'.", startupFolder, Environment.UserName), - "Cannot install update because startup folder is not writable by the user"); + "Cannot install update because startup folder is not writable by the user."); } if (!_diskProvider.FolderWritable(uiFolder)) { return new HealthCheck(GetType(), HealthCheckResult.Error, string.Format("Cannot install update because UI folder '{0}' is not writable by the user '{1}'.", uiFolder, Environment.UserName), - "Cannot install update because UI folder is not writable by the user"); + "Cannot install update because UI folder is not writable by the user."); } } @@ -60,7 +60,7 @@ namespace NzbDrone.Core.HealthCheck.Checks { if (_checkUpdateService.AvailableUpdate() != null) { - return new HealthCheck(GetType(), HealthCheckResult.Warning, "New update is available"); + return new HealthCheck(GetType(), HealthCheckResult.Warning, "New update is available."); } } diff --git a/src/NzbDrone.Core/Notifications/Boxcar/BoxcarSettings.cs b/src/NzbDrone.Core/Notifications/Boxcar/BoxcarSettings.cs index 8d28ae8ef..96b3ce291 100644 --- a/src/NzbDrone.Core/Notifications/Boxcar/BoxcarSettings.cs +++ b/src/NzbDrone.Core/Notifications/Boxcar/BoxcarSettings.cs @@ -1,4 +1,4 @@ -using FluentValidation; +using FluentValidation; using NzbDrone.Core.Annotations; using NzbDrone.Core.ThingiProvider; using NzbDrone.Core.Validation; @@ -17,7 +17,7 @@ namespace NzbDrone.Core.Notifications.Boxcar { private static readonly BoxcarSettingsValidator Validator = new BoxcarSettingsValidator(); - [FieldDefinition(0, Label = "Access Token", HelpText = "Your Access Token, from your Boxcar account settings: https://new.boxcar.io/account/edit", HelpLink = "https://new.boxcar.io/account/edit")] + [FieldDefinition(0, Label = "Access Token", HelpText = "Your access token, from your Boxcar account settings.", HelpLink = "https://new.boxcar.io/account/edit")] public string Token { get; set; } public NzbDroneValidationResult Validate() diff --git a/src/NzbDrone.Core/Notifications/CustomScript/CustomScriptSettings.cs b/src/NzbDrone.Core/Notifications/CustomScript/CustomScriptSettings.cs index e426ec651..d8b0324f8 100644 --- a/src/NzbDrone.Core/Notifications/CustomScript/CustomScriptSettings.cs +++ b/src/NzbDrone.Core/Notifications/CustomScript/CustomScriptSettings.cs @@ -1,4 +1,4 @@ -using FluentValidation; +using FluentValidation; using NzbDrone.Core.Annotations; using NzbDrone.Core.ThingiProvider; using NzbDrone.Core.Validation; @@ -21,7 +21,7 @@ namespace NzbDrone.Core.Notifications.CustomScript [FieldDefinition(0, Label = "Path", Type = FieldType.FilePath)] public string Path { get; set; } - [FieldDefinition(1, Label = "Arguments", HelpText = "Arguments to pass to the script")] + [FieldDefinition(1, Label = "Arguments", HelpText = "Arguments to pass to the script.")] public string Arguments { get; set; } public NzbDroneValidationResult Validate() diff --git a/src/NzbDrone.Core/Notifications/Email/EmailSettings.cs b/src/NzbDrone.Core/Notifications/Email/EmailSettings.cs index 793b7b163..bd747ac97 100644 --- a/src/NzbDrone.Core/Notifications/Email/EmailSettings.cs +++ b/src/NzbDrone.Core/Notifications/Email/EmailSettings.cs @@ -1,4 +1,4 @@ -using FluentValidation; +using FluentValidation; using NzbDrone.Core.Annotations; using NzbDrone.Core.ThingiProvider; using NzbDrone.Core.Validation; @@ -27,7 +27,7 @@ namespace NzbDrone.Core.Notifications.Email Ssl = true; } - [FieldDefinition(0, Label = "Server", HelpText = "Hostname or IP of Email server")] + [FieldDefinition(0, Label = "Server", HelpText = "Hostname or IP address of the email server")] public string Server { get; set; } [FieldDefinition(1, Label = "Port")] diff --git a/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowserSettings.cs b/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowserSettings.cs index 71e345d67..9c8567903 100644 --- a/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowserSettings.cs +++ b/src/NzbDrone.Core/Notifications/MediaBrowser/MediaBrowserSettings.cs @@ -1,4 +1,4 @@ -using FluentValidation; +using FluentValidation; using Newtonsoft.Json; using NzbDrone.Core.Annotations; using NzbDrone.Core.ThingiProvider; @@ -33,10 +33,10 @@ namespace NzbDrone.Core.Notifications.MediaBrowser [FieldDefinition(2, Label = "API Key")] public string ApiKey { get; set; } - [FieldDefinition(3, Label = "Send Notifications", HelpText = "Have MediaBrowser send notfications to configured providers", Type = FieldType.Checkbox)] + [FieldDefinition(3, Label = "Send Notifications", HelpText = "Should MediaBrowser send notfications to configured providers?", Type = FieldType.Checkbox)] public bool Notify { get; set; } - [FieldDefinition(4, Label = "Update Library", HelpText = "Update Library on Download & Rename?", Type = FieldType.Checkbox)] + [FieldDefinition(4, Label = "Update Library", HelpText = "Update library on download & rename?", Type = FieldType.Checkbox)] public bool UpdateLibrary { get; set; } [JsonIgnore] diff --git a/src/NzbDrone.Core/Notifications/Plex/PlexServerSettings.cs b/src/NzbDrone.Core/Notifications/Plex/PlexServerSettings.cs index 9a5d0587c..40b750a08 100644 --- a/src/NzbDrone.Core/Notifications/Plex/PlexServerSettings.cs +++ b/src/NzbDrone.Core/Notifications/Plex/PlexServerSettings.cs @@ -1,4 +1,4 @@ -using FluentValidation; +using FluentValidation; using NzbDrone.Core.Annotations; using NzbDrone.Core.ThingiProvider; using NzbDrone.Core.Validation; @@ -40,7 +40,7 @@ namespace NzbDrone.Core.Notifications.Plex [FieldDefinition(4, Label = "Update Library", Type = FieldType.Checkbox)] public bool UpdateLibrary { get; set; } - [FieldDefinition(5, Label = "Use SSL", Type = FieldType.Checkbox, HelpText = "Connect to Plex over HTTPS instead of HTTP")] + [FieldDefinition(5, Label = "Use SSL", Type = FieldType.Checkbox, HelpText = "Connect to Plex over HTTPS instead of HTTP?")] public bool UseSsl { get; set; } public bool IsValid => !string.IsNullOrWhiteSpace(Host); diff --git a/src/NzbDrone.Core/Notifications/PushBullet/PushBulletSettings.cs b/src/NzbDrone.Core/Notifications/PushBullet/PushBulletSettings.cs index d2c6d1e4c..a3138df9e 100644 --- a/src/NzbDrone.Core/Notifications/PushBullet/PushBulletSettings.cs +++ b/src/NzbDrone.Core/Notifications/PushBullet/PushBulletSettings.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using FluentValidation; using NzbDrone.Core.Annotations; using NzbDrone.Core.ThingiProvider; @@ -27,13 +27,13 @@ namespace NzbDrone.Core.Notifications.PushBullet [FieldDefinition(0, Label = "API Key", HelpLink = "https://www.pushbullet.com/")] public string ApiKey { get; set; } - [FieldDefinition(1, Label = "Device IDs", HelpText = "List of device IDs, use device_iden in the device's URL on pushbullet.com (leave blank to send to all devices)", Type = FieldType.Tag)] + [FieldDefinition(1, Label = "Device IDs", HelpText = "List of device IDs, use device_iden in the device's URL on pushbullet.com (leave blank to send to all devices).", Type = FieldType.Tag)] public IEnumerable DeviceIds { get; set; } - [FieldDefinition(2, Label = "Channel Tags", HelpText = "List of Channel Tags to send notifications to", Type = FieldType.Tag)] + [FieldDefinition(2, Label = "Channel Tags", HelpText = "List of channel tags to send notifications to.", Type = FieldType.Tag)] public IEnumerable ChannelTags { get; set; } - [FieldDefinition(3, Label = "Sender ID", HelpText = "The device ID to send notifications from, use device_iden in the device's URL on pushbullet.com (leave blank to send from yourself)")] + [FieldDefinition(3, Label = "Sender ID", HelpText = "The device ID to send notifications from, use device_iden in the device's URL on pushbullet.com (leave blank to send from yourself).")] public string SenderId { get; set; } public NzbDroneValidationResult Validate() diff --git a/src/NzbDrone.Core/Notifications/Pushalot/PushalotSettings.cs b/src/NzbDrone.Core/Notifications/Pushalot/PushalotSettings.cs index de3ebb1ff..b357a9998 100644 --- a/src/NzbDrone.Core/Notifications/Pushalot/PushalotSettings.cs +++ b/src/NzbDrone.Core/Notifications/Pushalot/PushalotSettings.cs @@ -1,4 +1,4 @@ -using FluentValidation; +using FluentValidation; using NzbDrone.Core.Annotations; using NzbDrone.Core.ThingiProvider; using NzbDrone.Core.Validation; @@ -28,7 +28,7 @@ namespace NzbDrone.Core.Notifications.Pushalot [FieldDefinition(1, Label = "Priority", Type = FieldType.Select, SelectOptions = typeof(PushalotPriority))] public int Priority { get; set; } - [FieldDefinition(2, Label = "Image", Type = FieldType.Checkbox, HelpText = "Include Radarr logo with notifications")] + [FieldDefinition(2, Label = "Image", Type = FieldType.Checkbox, HelpText = "Include Radarr logo with notifications?")] public bool Image { get; set; } public bool IsValid => !string.IsNullOrWhiteSpace(AuthToken); diff --git a/src/NzbDrone.Core/Notifications/Pushover/PushoverSettings.cs b/src/NzbDrone.Core/Notifications/Pushover/PushoverSettings.cs index c03ea7cc6..98ac73c66 100644 --- a/src/NzbDrone.Core/Notifications/Pushover/PushoverSettings.cs +++ b/src/NzbDrone.Core/Notifications/Pushover/PushoverSettings.cs @@ -1,4 +1,4 @@ -using FluentValidation; +using FluentValidation; using NzbDrone.Core.Annotations; using NzbDrone.Core.ThingiProvider; using NzbDrone.Core.Validation; @@ -34,13 +34,13 @@ namespace NzbDrone.Core.Notifications.Pushover [FieldDefinition(2, Label = "Priority", Type = FieldType.Select, SelectOptions = typeof(PushoverPriority) )] public int Priority { get; set; } - [FieldDefinition(3, Label = "Retry", Type = FieldType.Textbox, HelpText = "Interval to retry Emergency alerts, minimum 30 seconds")] + [FieldDefinition(3, Label = "Retry", Type = FieldType.Textbox, HelpText = "Interval to retry emergency alerts, minimum 30 seconds.")] public int Retry { get; set; } - [FieldDefinition(4, Label = "Expire", Type = FieldType.Textbox, HelpText = "Maximum time to retry Emergency alerts, maximum 86400 seconds")] + [FieldDefinition(4, Label = "Expire", Type = FieldType.Textbox, HelpText = "Maximum time to retry emergency alerts, maximum 86400 seconds.")] public int Expire { get; set; } - [FieldDefinition(5, Label = "Sound", Type = FieldType.Textbox, HelpText = "Notification sound, leave blank to use the default", HelpLink = "https://pushover.net/api#sounds")] + [FieldDefinition(5, Label = "Sound", Type = FieldType.Textbox, HelpText = "Notification sound, leave blank to use the default.", HelpLink = "https://pushover.net/api#sounds")] public string Sound { get; set; } public bool IsValid => !string.IsNullOrWhiteSpace(UserKey) && Priority >= -1 && Priority <= 2; diff --git a/src/NzbDrone.Core/Notifications/Slack/SlackSettings.cs b/src/NzbDrone.Core/Notifications/Slack/SlackSettings.cs index bef9b5d69..12c32078a 100644 --- a/src/NzbDrone.Core/Notifications/Slack/SlackSettings.cs +++ b/src/NzbDrone.Core/Notifications/Slack/SlackSettings.cs @@ -1,4 +1,4 @@ -using FluentValidation; +using FluentValidation; using NzbDrone.Core.Annotations; using NzbDrone.Core.ThingiProvider; using NzbDrone.Core.Validation; @@ -18,13 +18,13 @@ namespace NzbDrone.Core.Notifications.Slack { private static readonly SlackSettingsValidator Validator = new SlackSettingsValidator(); - [FieldDefinition(0, Label = "Webhook URL", HelpText = "Slack channel webhook url", Type = FieldType.Url, HelpLink = "https://my.slack.com/services/new/incoming-webhook/")] + [FieldDefinition(0, Label = "Webhook URL", HelpText = "Slack channel webhook url.", Type = FieldType.Url, HelpLink = "https://my.slack.com/services/new/incoming-webhook/")] public string WebHookUrl { get; set; } - [FieldDefinition(1, Label = "Username", HelpText = "Choose the username that this integration will post as", Type = FieldType.Textbox)] + [FieldDefinition(1, Label = "Username", HelpText = "Choose the username that this integration will post as.", Type = FieldType.Textbox)] public string Username { get; set; } - [FieldDefinition(2, Label = "Icon", HelpText = "Change the icon that is used for messages from this integration (Emoji or URL)", Type = FieldType.Textbox, HelpLink = "http://www.emoji-cheat-sheet.com/")] + [FieldDefinition(2, Label = "Icon", HelpText = "Change the icon that is used for messages from this integration (Emoji or URL).", Type = FieldType.Textbox, HelpLink = "http://www.emoji-cheat-sheet.com/")] public string Icon { get; set; } public NzbDroneValidationResult Validate() diff --git a/src/NzbDrone.Core/Notifications/Synology/SynologyIndexerSettings.cs b/src/NzbDrone.Core/Notifications/Synology/SynologyIndexerSettings.cs index 5f9be1a2f..42014fd48 100644 --- a/src/NzbDrone.Core/Notifications/Synology/SynologyIndexerSettings.cs +++ b/src/NzbDrone.Core/Notifications/Synology/SynologyIndexerSettings.cs @@ -1,4 +1,4 @@ -using FluentValidation; +using FluentValidation; using NzbDrone.Core.Annotations; using NzbDrone.Core.ThingiProvider; using NzbDrone.Core.Validation; @@ -22,7 +22,7 @@ namespace NzbDrone.Core.Notifications.Synology UpdateLibrary = true; } - [FieldDefinition(0, Label = "Update Library", Type = FieldType.Checkbox, HelpText = "Call synoindex on localhost to update a library file")] + [FieldDefinition(0, Label = "Update Library", Type = FieldType.Checkbox, HelpText = "Call synoindex on localhost to update a library file.")] public bool UpdateLibrary { get; set; } public NzbDroneValidationResult Validate() diff --git a/src/NzbDrone.Core/Notifications/Telegram/TelegramSettings.cs b/src/NzbDrone.Core/Notifications/Telegram/TelegramSettings.cs index 58f04709e..85653377f 100644 --- a/src/NzbDrone.Core/Notifications/Telegram/TelegramSettings.cs +++ b/src/NzbDrone.Core/Notifications/Telegram/TelegramSettings.cs @@ -1,4 +1,4 @@ -using FluentValidation; +using FluentValidation; using NzbDrone.Core.Annotations; using NzbDrone.Core.ThingiProvider; using NzbDrone.Core.Validation; @@ -21,7 +21,7 @@ namespace NzbDrone.Core.Notifications.Telegram [FieldDefinition(0, Label = "Bot Token", HelpLink = "https://core.telegram.org/bots")] public string BotToken { get; set; } - [FieldDefinition(1, Label = "Chat ID", HelpLink = "http://stackoverflow.com/a/37396871/882971", HelpText = "You must start a conversation with the bot or add it to your group to receive messages")] + [FieldDefinition(1, Label = "Chat ID", HelpLink = "http://stackoverflow.com/a/37396871/882971", HelpText = "You must start a conversation with the bot or add it to your group before you can receive messages.")] public string ChatId { get; set; } public bool IsValid => !string.IsNullOrWhiteSpace(ChatId) && !string.IsNullOrWhiteSpace(BotToken); diff --git a/src/NzbDrone.Core/Notifications/Twitter/TwitterSettings.cs b/src/NzbDrone.Core/Notifications/Twitter/TwitterSettings.cs index 0871be242..f1e3aa880 100644 --- a/src/NzbDrone.Core/Notifications/Twitter/TwitterSettings.cs +++ b/src/NzbDrone.Core/Notifications/Twitter/TwitterSettings.cs @@ -1,4 +1,4 @@ -using FluentValidation; +using FluentValidation; using NzbDrone.Common.Extensions; using NzbDrone.Core.Annotations; using NzbDrone.Core.ThingiProvider; @@ -18,7 +18,7 @@ namespace NzbDrone.Core.Notifications.Twitter RuleFor(c => c.Mention).NotEmpty().When(c => c.DirectMessage); RuleFor(c => c.DirectMessage).Equal(true) - .WithMessage("Using Direct Messaging is recommended, or use a private account.") + .WithMessage("Using direct messaging is recommended, or use a private account.") .AsWarning(); RuleFor(c => c.AuthorizeNotification).Empty() @@ -37,10 +37,10 @@ namespace NzbDrone.Core.Notifications.Twitter AuthorizeNotification = "step1"; } - [FieldDefinition(0, Label = "Consumer Key", HelpText = "Consumer key from a Twitter application", HelpLink = "https://github.com/Radarr/Radarr/wiki/Twitter-Notifications")] + [FieldDefinition(0, Label = "Consumer Key", HelpText = "Consumer key from a Twitter application.", HelpLink = "https://github.com/Radarr/Radarr/wiki/Twitter-Notifications")] public string ConsumerKey { get; set; } - [FieldDefinition(1, Label = "Consumer Secret", HelpText = "Consumer secret from a Twitter application", HelpLink = "https://github.com/Radarr/Radarr/wiki/Twitter-Notifications")] + [FieldDefinition(1, Label = "Consumer Secret", HelpText = "Consumer secret from a Twitter application.", HelpLink = "https://github.com/Radarr/Radarr/wiki/Twitter-Notifications")] public string ConsumerSecret { get; set; } [FieldDefinition(2, Label = "Access Token", Advanced = true)] @@ -49,10 +49,10 @@ namespace NzbDrone.Core.Notifications.Twitter [FieldDefinition(3, Label = "Access Token Secret", Advanced = true)] public string AccessTokenSecret { get; set; } - [FieldDefinition(4, Label = "Mention", HelpText = "Mention this user in sent tweets")] + [FieldDefinition(4, Label = "Mention", HelpText = "Mention this user in sent tweets.")] public string Mention { get; set; } - [FieldDefinition(5, Label = "Direct Message", Type = FieldType.Checkbox, HelpText = "Send a direct message instead of a public message")] + [FieldDefinition(5, Label = "Direct Message", Type = FieldType.Checkbox, HelpText = "Send a direct message instead of a public message.")] public bool DirectMessage { get; set; } [FieldDefinition(6, Label = "Connect to twitter", Type = FieldType.Action)] diff --git a/src/NzbDrone.Core/Notifications/Webhook/WebhookSettings.cs b/src/NzbDrone.Core/Notifications/Webhook/WebhookSettings.cs index 38ac3ee12..bfb1c3c6e 100644 --- a/src/NzbDrone.Core/Notifications/Webhook/WebhookSettings.cs +++ b/src/NzbDrone.Core/Notifications/Webhook/WebhookSettings.cs @@ -1,4 +1,4 @@ -using System; +using System; using FluentValidation; using NzbDrone.Core.Annotations; using NzbDrone.Core.ThingiProvider; @@ -26,7 +26,7 @@ namespace NzbDrone.Core.Notifications.Webhook [FieldDefinition(0, Label = "URL", Type = FieldType.Url)] public string Url { get; set; } - [FieldDefinition(1, Label = "Method", Type = FieldType.Select, SelectOptions = typeof(WebhookMethod), HelpText = "Which HTTP method to use submit to the Webservice")] + [FieldDefinition(1, Label = "Method", Type = FieldType.Select, SelectOptions = typeof(WebhookMethod), HelpText = "Which HTTP method to use submit to the web service.")] public int Method { get; set; } public NzbDroneValidationResult Validate() diff --git a/src/NzbDrone.Core/Notifications/Xbmc/XbmcSettings.cs b/src/NzbDrone.Core/Notifications/Xbmc/XbmcSettings.cs index f861dd654..d5bd8ba0f 100644 --- a/src/NzbDrone.Core/Notifications/Xbmc/XbmcSettings.cs +++ b/src/NzbDrone.Core/Notifications/Xbmc/XbmcSettings.cs @@ -1,4 +1,4 @@ -using System.ComponentModel; +using System.ComponentModel; using FluentValidation; using Newtonsoft.Json; using NzbDrone.Core.Annotations; @@ -39,19 +39,19 @@ namespace NzbDrone.Core.Notifications.Xbmc public string Password { get; set; } [DefaultValue(5)] - [FieldDefinition(4, Label = "Display Time", HelpText = "How long the notification will be displayed for (In seconds)")] + [FieldDefinition(4, Label = "Display Time", HelpText = "How long the notification will be displayed for (in seconds).")] public int DisplayTime { get; set; } [FieldDefinition(5, Label = "GUI Notification", Type = FieldType.Checkbox)] public bool Notify { get; set; } - [FieldDefinition(6, Label = "Update Library", HelpText = "Update Library on Download & Rename?", Type = FieldType.Checkbox)] + [FieldDefinition(6, Label = "Update Library", HelpText = "Update library on download & rename?", Type = FieldType.Checkbox)] public bool UpdateLibrary { get; set; } - [FieldDefinition(7, Label = "Clean Library", HelpText = "Clean Library after update?", Type = FieldType.Checkbox)] + [FieldDefinition(7, Label = "Clean Library", HelpText = "Clean library after update?", Type = FieldType.Checkbox)] public bool CleanLibrary { get; set; } - [FieldDefinition(8, Label = "Always Update", HelpText = "Update Library even when a video is playing?", Type = FieldType.Checkbox)] + [FieldDefinition(8, Label = "Always Update", HelpText = "Update library even when a video is playing?", Type = FieldType.Checkbox)] public bool AlwaysUpdate { get; set; } [JsonIgnore] diff --git a/src/UI/Activity/ActivityLayoutTemplate.hbs b/src/UI/Activity/ActivityLayoutTemplate.hbs index c9c08ecf7..445c5c944 100644 --- a/src/UI/Activity/ActivityLayoutTemplate.hbs +++ b/src/UI/Activity/ActivityLayoutTemplate.hbs @@ -8,4 +8,4 @@
- \ No newline at end of file + diff --git a/src/UI/Activity/Blacklist/BlacklistLayout.js b/src/UI/Activity/Blacklist/BlacklistLayout.js index c6ca98dab..ff070bb81 100644 --- a/src/UI/Activity/Blacklist/BlacklistLayout.js +++ b/src/UI/Activity/Blacklist/BlacklistLayout.js @@ -82,7 +82,7 @@ module.exports = Marionette.Layout.extend({ storeState : false, items : [ { - title : 'Clear Blacklist', + title : 'Clear blacklist', icon : 'icon-sonarr-clear', command : 'clearBlacklist' } diff --git a/src/UI/Activity/Blacklist/BlacklistLayoutTemplate.hbs b/src/UI/Activity/Blacklist/BlacklistLayoutTemplate.hbs index 8f78eb0db..28608688a 100644 --- a/src/UI/Activity/Blacklist/BlacklistLayoutTemplate.hbs +++ b/src/UI/Activity/Blacklist/BlacklistLayoutTemplate.hbs @@ -1,11 +1,11 @@ -
+
-
+
-
+
diff --git a/src/UI/Activity/Blacklist/Details/BlacklistDetailsLayoutTemplate.hbs b/src/UI/Activity/Blacklist/Details/BlacklistDetailsLayoutTemplate.hbs index 3cdfa99c7..e7940b03f 100644 --- a/src/UI/Activity/Blacklist/Details/BlacklistDetailsLayoutTemplate.hbs +++ b/src/UI/Activity/Blacklist/Details/BlacklistDetailsLayoutTemplate.hbs @@ -1,16 +1,10 @@
- - -

- Blacklisted -

- -
-
- + +

Blacklisted

+
diff --git a/src/UI/Activity/Blacklist/Details/BlacklistDetailsViewTemplate.hbs b/src/UI/Activity/Blacklist/Details/BlacklistDetailsViewTemplate.hbs index d29a878fc..3f7f57a73 100644 --- a/src/UI/Activity/Blacklist/Details/BlacklistDetailsViewTemplate.hbs +++ b/src/UI/Activity/Blacklist/Details/BlacklistDetailsViewTemplate.hbs @@ -1,23 +1,21 @@
-
Name:
{{sourceTitle}}
{{#if protocol}} - {{#unless_eq protocol compare="unknown"}} -
Protocol:
-
{{protocol}}
- {{/unless_eq}} + {{#unless_eq protocol compare="unknown"}} +
Protocol:
+
{{protocol}}
+ {{/unless_eq}} {{/if}} {{#if indexer}} -
Indexer:
-
{{indexer}}
+
Indexer:
+
{{indexer}}
{{/if}} - {{#if message}} -
Message:
-
{{message}}
+
Message:
+
{{message}}
{{/if}}
diff --git a/src/UI/Activity/History/Details/HistoryDetailsLayoutTemplate.hbs b/src/UI/Activity/History/Details/HistoryDetailsLayoutTemplate.hbs index 892dbfc35..f2592e59b 100644 --- a/src/UI/Activity/History/Details/HistoryDetailsLayoutTemplate.hbs +++ b/src/UI/Activity/History/Details/HistoryDetailsLayoutTemplate.hbs @@ -1,21 +1,19 @@
- - +

{{#if_eq eventType compare="grabbed"}}Grabbed{{/if_eq}} - {{#if_eq eventType compare="downloadFailed"}}Download Failed{{/if_eq}} - {{#if_eq eventType compare="downloadFolderImported"}}Episode Imported{{/if_eq}} - {{#if_eq eventType compare="episodeFileDeleted"}}Episode File Deleted{{/if_eq}} + {{#if_eq eventType compare="downloadFailed"}}Download failed{{/if_eq}} + {{#if_eq eventType compare="downloadFolderImported"}}Movie imported{{/if_eq}} + {{#if_eq eventType compare="episodeFileDeleted"}}Movie file deleted{{/if_eq}}

- -
-
-
+
- {{#if_eq eventType compare="grabbed"}}{{/if_eq}} + {{#if_eq eventType compare="grabbed"}} + + {{/if_eq}}
diff --git a/src/UI/Activity/History/Details/HistoryDetailsViewTemplate.hbs b/src/UI/Activity/History/Details/HistoryDetailsViewTemplate.hbs index 090c46978..0d31f3464 100644 --- a/src/UI/Activity/History/Details/HistoryDetailsViewTemplate.hbs +++ b/src/UI/Activity/History/Details/HistoryDetailsViewTemplate.hbs @@ -1,103 +1,101 @@ {{#if_eq eventType compare="grabbed"}} -
- -
Name:
-
{{sourceTitle}}
- - {{#with data}} - {{#if indexer}} -
Indexer:
-
{{indexer}}
- {{/if}} - - {{#if releaseGroup}} -
Release Group:
-
{{releaseGroup}}
- {{/if}} - - {{#if nzbInfoUrl}} -
Info:
-
{{nzbInfoUrl}}
- {{/if}} - - {{#if downloadClient}} -
Download Client:
-
{{downloadClient}}
- {{/if}} - - {{#if downloadId}} -
Grab ID:
-
{{downloadId}}
- {{/if}} - - {{#if age}} - {{historyAge}} - {{/if}} - - {{#if publishedDate}} -
Published Date:
-
{{ShortDate publishedDate}} {{LTS publishedDate}}
- {{/if}} - {{/with}} -
+
+
Name:
+
{{sourceTitle}}
+ + {{#with data}} + {{#if indexer}} +
Indexer:
+
{{indexer}}
+ {{/if}} + + {{#if releaseGroup}} +
Release group:
+
{{releaseGroup}}
+ {{/if}} + + {{#if nzbInfoUrl}} +
Info:
+
{{nzbInfoUrl}}
+ {{/if}} + + {{#if downloadClient}} +
Download client:
+
{{downloadClient}}
+ {{/if}} + + {{#if downloadId}} +
Grab ID:
+
{{downloadId}}
+ {{/if}} + + {{#if age}} + {{historyAge}} + {{/if}} + + {{#if publishedDate}} +
Published date:
+
{{ShortDate publishedDate}} {{LTS publishedDate}}
+ {{/if}} + {{/with}} +
{{/if_eq}} {{#if_eq eventType compare="downloadFailed"}} -
+
-
Name:
-
{{sourceTitle}}
+
Name:
+
{{sourceTitle}}
- {{#with data}} -
Message:
-
{{message}}
- {{/with}} -
+ {{#with data}} +
Message:
+
{{message}}
+ {{/with}} +
{{/if_eq}} {{#if_eq eventType compare="downloadFolderImported"}} -
- - {{#if sourceTitle}} -
Name:
-
{{sourceTitle}}
- {{/if}} - - {{#with data}} - {{#if droppedPath}} -
Source:
-
{{droppedPath}}
- {{/if}} - - {{#if importedPath}} -
Imported To:
-
{{importedPath}}
- {{/if}} - {{/with}} -
+
+ + {{#if sourceTitle}} +
Name:
+
{{sourceTitle}}
+ {{/if}} + + {{#with data}} + {{#if droppedPath}} +
Source:
+
{{droppedPath}}
+ {{/if}} + + {{#if importedPath}} +
Imported to:
+
{{importedPath}}
+ {{/if}} + {{/with}} +
{{/if_eq}} {{#if_eq eventType compare="episodeFileDeleted"}} -
- -
Path:
-
{{sourceTitle}}
- - {{#with data}} -
Reason:
-
- {{#if_eq reason compare="Manual"}} - File was deleted by via UI - {{/if_eq}} - - {{#if_eq reason compare="MissingFromDisk"}} - Radarr was unable to find the file on disk so it was removed - {{/if_eq}} - - {{#if_eq reason compare="Upgrade"}} - File was deleted to import an upgrade - {{/if_eq}} -
- {{/with}} -
-{{/if_eq}} \ No newline at end of file +
+
Path:
+
{{sourceTitle}}
+ + {{#with data}} +
Reason:
+
+ {{#if_eq reason compare="Manual"}} + File was deleted by via UI. + {{/if_eq}} + + {{#if_eq reason compare="MissingFromDisk"}} + Radarr was unable to find the file on disk so it was removed. + {{/if_eq}} + + {{#if_eq reason compare="Upgrade"}} + File was deleted to import an upgrade. + {{/if_eq}} +
+ {{/with}} +
+{{/if_eq}} diff --git a/src/UI/Activity/History/HistoryLayout.js b/src/UI/Activity/History/HistoryLayout.js index 3231d1cbf..0318b271c 100644 --- a/src/UI/Activity/History/HistoryLayout.js +++ b/src/UI/Activity/History/HistoryLayout.js @@ -28,7 +28,7 @@ module.exports = Marionette.Layout.extend({ }, { name : 'movie', - label : 'Movie Title', + label : 'Movie title', cell : MovieTitleCell, }, { diff --git a/src/UI/Activity/History/HistoryLayoutTemplate.hbs b/src/UI/Activity/History/HistoryLayoutTemplate.hbs index bffb274fe..1a02c85e7 100644 --- a/src/UI/Activity/History/HistoryLayoutTemplate.hbs +++ b/src/UI/Activity/History/HistoryLayoutTemplate.hbs @@ -1,11 +1,11 @@ -
+
-
+
-
+
diff --git a/src/UI/Activity/Queue/QueueActionsCellTemplate.hbs b/src/UI/Activity/Queue/QueueActionsCellTemplate.hbs index 13bee034e..301897a44 100644 --- a/src/UI/Activity/Queue/QueueActionsCellTemplate.hbs +++ b/src/UI/Activity/Queue/QueueActionsCellTemplate.hbs @@ -1,12 +1,12 @@ {{#if_eq status compare="Completed"}} {{#if_eq trackedDownloadStatus compare="Warning"}} - + {{/if_eq}} {{/if_eq}} {{#if_eq status compare="Pending"}} - - + + {{else}} - + {{/if_eq}} diff --git a/src/UI/Activity/Queue/QueueLayout.js b/src/UI/Activity/Queue/QueueLayout.js index 0fc561165..a34a0966c 100644 --- a/src/UI/Activity/Queue/QueueLayout.js +++ b/src/UI/Activity/Queue/QueueLayout.js @@ -56,7 +56,7 @@ module.exports = Marionette.Layout.extend({ }, { name : 'timeleft', - label : 'Time Left', + label : 'Time left', cell : TimeleftCell, cellValue : 'this' }, diff --git a/src/UI/Activity/Queue/QueueLayoutTemplate.hbs b/src/UI/Activity/Queue/QueueLayoutTemplate.hbs index e8e6a3c12..11178a228 100644 --- a/src/UI/Activity/Queue/QueueLayoutTemplate.hbs +++ b/src/UI/Activity/Queue/QueueLayoutTemplate.hbs @@ -1,11 +1,11 @@
-
+
-
+
-
\ No newline at end of file +
diff --git a/src/UI/Activity/Queue/QueueStatusCellTemplate.hbs b/src/UI/Activity/Queue/QueueStatusCellTemplate.hbs index 477fdd028..79995de5e 100644 --- a/src/UI/Activity/Queue/QueueStatusCellTemplate.hbs +++ b/src/UI/Activity/Queue/QueueStatusCellTemplate.hbs @@ -5,4 +5,4 @@
  • {{this}}
    • {{/each}} -{{/each}} \ No newline at end of file +{{/each}} diff --git a/src/UI/Activity/Queue/RemoveFromQueueViewTemplate.hbs b/src/UI/Activity/Queue/RemoveFromQueueViewTemplate.hbs index c0834ea69..bbb52ed16 100644 --- a/src/UI/Activity/Queue/RemoveFromQueueViewTemplate.hbs +++ b/src/UI/Activity/Queue/RemoveFromQueueViewTemplate.hbs @@ -1,48 +1,45 @@
    - +

    {{title}}

    -
    Are you sure you want to remove '{{title}}'?
    - {{#if showBlacklist}} -
    -
    -
    -
    - - -
    -
    -
    - + + +
    diff --git a/src/UI/AddMovies/AddMoviesLayoutTemplate.hbs b/src/UI/AddMovies/AddMoviesLayoutTemplate.hbs index 887b21e3e..707f2c097 100644 --- a/src/UI/AddMovies/AddMoviesLayoutTemplate.hbs +++ b/src/UI/AddMovies/AddMoviesLayoutTemplate.hbs @@ -1,34 +1,43 @@
    -
    -
    - - - - -
    +
    +
    + + + +
    +
    - - +
    @@ -38,7 +47,7 @@
    -
    -
    -
    +
    +
    +
    diff --git a/src/UI/AddMovies/AddMoviesView.js b/src/UI/AddMovies/AddMoviesView.js index a522deb56..0f61c4cf7 100644 --- a/src/UI/AddMovies/AddMoviesView.js +++ b/src/UI/AddMovies/AddMoviesView.js @@ -294,7 +294,7 @@ module.exports = Marionette.Layout.extend({ _discoverList : function(options) { this.ui.discoverLists.tab("show"); - this.ui.discoverHeader.html("Showing movies from list: "+options.target.textContent); + this.ui.discoverHeader.html("Showing movies from list: " + options.target.textContent); this.collection.reset(); this.collection = new AddFromListCollection(); diff --git a/src/UI/AddMovies/AddMoviesViewTemplate.hbs b/src/UI/AddMovies/AddMoviesViewTemplate.hbs index 4e41c6afb..66511bb53 100644 --- a/src/UI/AddMovies/AddMoviesViewTemplate.hbs +++ b/src/UI/AddMovies/AddMoviesViewTemplate.hbs @@ -1,43 +1,43 @@ {{#if folder.path}} -
    -
    - {{folder.path}} +
    +
    + {{folder.path}} +
    -
    {{/if}} +{{/if}}
    - -

    - Recommendations by The Movie Database based on your library: -

    + +

    Recommendations by The Movie Database based on your library:

    - - + + + {{#if folder}} - + {{else}} - + {{/if}}
    -
    +
    -