diff --git a/frontend/src/Calendar/Legend/LegendIconItem.css b/frontend/src/Calendar/Legend/LegendIconItem.css
index 01db0ba5a..d4b07f247 100644
--- a/frontend/src/Calendar/Legend/LegendIconItem.css
+++ b/frontend/src/Calendar/Legend/LegendIconItem.css
@@ -1,8 +1,5 @@
.legendIconItem {
- margin: 3px 0;
- margin-right: 6px;
- width: 150px;
- cursor: default;
+ margin-left: 6px;
}
.icon {
diff --git a/frontend/src/Calendar/Legend/LegendItem.css b/frontend/src/Calendar/Legend/LegendItem.css
index ddf3e6a61..98634ff74 100644
--- a/frontend/src/Calendar/Legend/LegendItem.css
+++ b/frontend/src/Calendar/Legend/LegendItem.css
@@ -1,33 +1,74 @@
+.legendItemContainer {
+ margin-right: 5px;
+ width: 220px;
+}
+
.legendItem {
- margin: 3px 0;
- margin-right: 6px;
- padding-left: 5px;
- width: 150px;
- border-left-width: 4px;
- border-left-style: solid;
- cursor: default;
+ display: inline-flex;
+ margin-top: -1px;
+ vertical-align: middle;
+ line-height: 16px;
}
-/*
- * Status
- */
-
-.downloaded {
- composes: downloaded from '~Calendar/Events/CalendarEvent.css';
+.legendItemColor {
+ margin-right: 8px;
+ width: 30px;
+ height: 16px;
+ border-radius: 4px;
}
-.downloading {
- composes: downloading from '~Calendar/Events/CalendarEvent.css';
+.queue {
+ composes: legendItemColor;
+
+ background-color: $queueColor;
}
-.unmonitored {
- composes: unmonitored from '~Calendar/Events/CalendarEvent.css';
+.continuing {
+ composes: legendItemColor;
+
+ background-color: $primaryColor;
}
-.missing {
- composes: missing from '~Calendar/Events/CalendarEvent.css';
+.availNotMonitored {
+ composes: legendItemColor;
+
+ background-color: $darkGray;
}
-.unreleased {
- composes: unreleased from '~Calendar/Events/CalendarEvent.css';
+.ended {
+ composes: legendItemColor;
+
+ background-color: $successColor;
+}
+
+.missingMonitored {
+ composes: legendItemColor;
+
+ background-color: $dangerColor;
+
+ &:global(.colorImpaired) {
+ background: repeating-linear-gradient(90deg, color($dangerColor shade(5%)), color($dangerColor shade(5%)) 5px, color($dangerColor shade(15%)) 5px, color($dangerColor shade(15%)) 10px);
+ }
+}
+
+.missingUnmonitored {
+ composes: legendItemColor;
+
+ background-color: $warningColor;
+
+ &:global(.colorImpaired) {
+ background: repeating-linear-gradient(45deg, $warningColor, $warningColor 5px, color($warningColor tint(15%)) 5px, color($warningColor tint(15%)) 10px);
+ }
+}
+
+.missingMonitoredColorImpaired {
+ background: repeating-linear-gradient(90deg, $colorImpairedGradientDark, $colorImpairedGradientDark 5px, $colorImpairedGradient 5px, $colorImpairedGradient 10px);
+}
+
+.missingUnmonitoredColorImpaired {
+ background: repeating-linear-gradient(45deg, $colorImpairedGradientDark, $colorImpairedGradientDark 5px, $colorImpairedGradient 5px, $colorImpairedGradient 10px);
+}
+
+.legendItemText {
+ display: inline-block;
}
diff --git a/frontend/src/Calendar/Legend/LegendItem.js b/frontend/src/Calendar/Legend/LegendItem.js
index 5da15baba..264704ace 100644
--- a/frontend/src/Calendar/Legend/LegendItem.js
+++ b/frontend/src/Calendar/Legend/LegendItem.js
@@ -1,35 +1,34 @@
import classNames from 'classnames';
import PropTypes from 'prop-types';
import React from 'react';
-import titleCase from 'Utilities/String/titleCase';
import styles from './LegendItem.css';
function LegendItem(props) {
const {
name,
- status,
- tooltip,
+ style,
colorImpairedMode
} = props;
return (
-
- {name ? name : titleCase(status)}
+
);
}
LegendItem.propTypes = {
- name: PropTypes.string,
- status: PropTypes.string.isRequired,
- tooltip: PropTypes.string.isRequired,
+ name: PropTypes.string.isRequired,
+ style: PropTypes.string.isRequired,
colorImpairedMode: PropTypes.bool.isRequired
};
diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json
index 0c7a9b056..493265486 100644
--- a/src/NzbDrone.Core/Localization/Core/en.json
+++ b/src/NzbDrone.Core/Localization/Core/en.json
@@ -244,8 +244,8 @@
"DownloadClientStatusCheckSingleClientMessage": "Download clients unavailable due to failures: {0}",
"DownloadClientUnavailable": "Download client is unavailable",
"Downloaded": "Downloaded",
- "DownloadedAndMonitored": "Downloaded and Monitored",
- "DownloadedButNotMonitored": "Downloaded, but not Monitored",
+ "DownloadedAndMonitored": "Downloaded (Monitored)",
+ "DownloadedButNotMonitored": "Downloaded (Unmonitored)",
"DownloadFailed": "Download failed",
"DownloadFailedCheckDownloadClientForMoreDetails": "Download failed: check download client for more details",
"DownloadFailedInterp": "Download failed: {0}",
@@ -468,7 +468,7 @@
"LookingForReleaseProfiles1": "Looking for Release Profiles? Try",
"LookingForReleaseProfiles2": "instead.",
"LowerCase": "Lower Case",
- "MaintenanceRelease": "Maintenance release: bug fixes and other improvements. See Github Commmit History for more details",
+ "MaintenanceRelease": "Maintenance Release: bug fixes and other improvements. See Github Commit History for more details",
"Manual": "Manual",
"ManualImport": "Manual Import",
"ManualImportSelectLanguage": "Manual Import - Select Language",
@@ -511,8 +511,8 @@
"MinutesSixty": "60 Minutes: {0}",
"Missing": "Missing",
"MissingFromDisk": "Radarr was unable to find the file on disk so it was removed",
- "MissingMonitoredAndConsideredAvailable": "Missing, Monitored and considered Available",
- "MissingNotMonitored": "Missing, not Monitored",
+ "MissingMonitoredAndConsideredAvailable": "Missing (Monitored)",
+ "MissingNotMonitored": "Missing (Unmonitored)",
"Mode": "Mode",
"Monday": "Monday",
"Monitor": "Monitor",
@@ -1006,7 +1006,7 @@
"UnmappedFolders": "Unmapped Folders",
"Unmonitored": "Unmonitored",
"UnmonitoredHelpText": "Include unmonitored movies in the iCal feed",
- "Unreleased": "Unreleased",
+ "Unreleased": "Unavailable",
"UnsavedChanges": "Unsaved Changes",
"UnselectAll": "Unselect All",
"UpdateAll": "Update All",