diff --git a/frontend/src/AddSeries/AddNewSeries/AddNewSeriesSearchResult.css b/frontend/src/AddSeries/AddNewSeries/AddNewSeriesSearchResult.css
index 1fdf7d358..469385630 100644
--- a/frontend/src/AddSeries/AddNewSeries/AddNewSeriesSearchResult.css
+++ b/frontend/src/AddSeries/AddNewSeries/AddNewSeriesSearchResult.css
@@ -35,7 +35,9 @@
}
.content {
+ display: flex;
flex: 0 1 100%;
+ flex-direction: column;
overflow: hidden;
}
@@ -94,4 +96,8 @@
justify-content: space-between;
overflow: hidden;
}
+
+ .overview {
+ margin-bottom: 20px;
+ }
}
diff --git a/frontend/src/AddSeries/AddNewSeries/AddNewSeriesSearchResult.js b/frontend/src/AddSeries/AddNewSeries/AddNewSeriesSearchResult.js
index b48ae5ef3..0ea70d4f9 100644
--- a/frontend/src/AddSeries/AddNewSeries/AddNewSeriesSearchResult.js
+++ b/frontend/src/AddSeries/AddNewSeries/AddNewSeriesSearchResult.js
@@ -4,6 +4,7 @@ import HeartRating from 'Components/HeartRating';
import Icon from 'Components/Icon';
import Label from 'Components/Label';
import Link from 'Components/Link/Link';
+import MetadataAttribution from 'Components/MetadataAttribution';
import { icons, kinds, sizes } from 'Helpers/Props';
import SeriesPoster from 'Series/SeriesPoster';
import AddNewSeriesModal from './AddNewSeriesModal';
@@ -188,6 +189,8 @@ class AddNewSeriesSearchResult extends Component {
{overview}
+
+
diff --git a/frontend/src/App/AppRoutes.js b/frontend/src/App/AppRoutes.js
index 004d49381..dd1bca729 100644
--- a/frontend/src/App/AppRoutes.js
+++ b/frontend/src/App/AppRoutes.js
@@ -20,6 +20,7 @@ import ImportListSettingsConnector from 'Settings/ImportLists/ImportListSettings
import IndexerSettingsConnector from 'Settings/Indexers/IndexerSettingsConnector';
import MediaManagementConnector from 'Settings/MediaManagement/MediaManagementConnector';
import MetadataSettings from 'Settings/Metadata/MetadataSettings';
+import MetadataSourceSettings from 'Settings/MetadataSource/MetadataSourceSettings';
import NotificationSettings from 'Settings/Notifications/NotificationSettings';
import Profiles from 'Settings/Profiles/Profiles';
import QualityConnector from 'Settings/Quality/QualityConnector';
@@ -192,6 +193,11 @@ function AppRoutes(props) {
component={MetadataSettings}
/>
+
+
+
+ Metadata is provided by TheTVDB
+
+
+ );
+}
diff --git a/frontend/src/Components/Page/Sidebar/PageSidebar.js b/frontend/src/Components/Page/Sidebar/PageSidebar.js
index f534b1ca3..bf926534c 100644
--- a/frontend/src/Components/Page/Sidebar/PageSidebar.js
+++ b/frontend/src/Components/Page/Sidebar/PageSidebar.js
@@ -127,6 +127,10 @@ const links = [
title: 'Metadata',
to: '/settings/metadata'
},
+ {
+ title: 'Metadata Source',
+ to: '/settings/metadatasource'
+ },
{
title: 'Tags',
to: '/settings/tags'
@@ -501,7 +505,7 @@ class PageSidebar extends Component {
key={child.to}
title={child.title}
to={child.to}
- isActive={pathname.startsWith(child.to)}
+ isActive={pathname === child.to}
isParentItem={false}
isChildItem={true}
statusComponent={child.statusComponent}
diff --git a/frontend/src/Content/Images/thetvdb.png b/frontend/src/Content/Images/thetvdb.png
new file mode 100644
index 000000000..1d751483b
Binary files /dev/null and b/frontend/src/Content/Images/thetvdb.png differ
diff --git a/frontend/src/Series/Details/SeriesDetails.css b/frontend/src/Series/Details/SeriesDetails.css
index a5056d12e..61e6b976f 100644
--- a/frontend/src/Series/Details/SeriesDetails.css
+++ b/frontend/src/Series/Details/SeriesDetails.css
@@ -138,7 +138,7 @@
}
.overview {
- flex: 1 0 auto;
+ flex: 1 0 0;
margin-top: 8px;
min-height: 0;
font-size: $intermediateFontSize;
diff --git a/frontend/src/Series/Details/SeriesDetails.js b/frontend/src/Series/Details/SeriesDetails.js
index a9cbc1242..c2583c650 100644
--- a/frontend/src/Series/Details/SeriesDetails.js
+++ b/frontend/src/Series/Details/SeriesDetails.js
@@ -8,6 +8,7 @@ import Label from 'Components/Label';
import IconButton from 'Components/Link/IconButton';
import LoadingIndicator from 'Components/Loading/LoadingIndicator';
import Measure from 'Components/Measure';
+import MetadataAttribution from 'Components/MetadataAttribution';
import MonitorToggleButton from 'Components/MonitorToggleButton';
import PageContent from 'Components/Page/PageContent';
import PageContentBody from 'Components/Page/PageContentBody';
@@ -579,11 +580,13 @@ class SeriesDetails extends Component {
+
+
diff --git a/frontend/src/Settings/MetadataSource/MetadataSourceSettings.js b/frontend/src/Settings/MetadataSource/MetadataSourceSettings.js
new file mode 100644
index 000000000..ef235393b
--- /dev/null
+++ b/frontend/src/Settings/MetadataSource/MetadataSourceSettings.js
@@ -0,0 +1,21 @@
+import React from 'react';
+import PageContent from 'Components/Page/PageContent';
+import PageContentBody from 'Components/Page/PageContentBody';
+import SettingsToolbarConnector from 'Settings/SettingsToolbarConnector';
+import TheTvdb from './TheTvdb';
+
+function MetadataSourceSettings() {
+ return (
+
+
+
+
+
+
+
+ );
+}
+
+export default MetadataSourceSettings;
diff --git a/frontend/src/Settings/MetadataSource/TheTvdb.css b/frontend/src/Settings/MetadataSource/TheTvdb.css
new file mode 100644
index 000000000..980fc0400
--- /dev/null
+++ b/frontend/src/Settings/MetadataSource/TheTvdb.css
@@ -0,0 +1,18 @@
+.container {
+ display: flex;
+}
+
+.info {
+ margin-left: 30px;
+}
+
+.title {
+ margin-bottom: 20px;
+ font-weight: 300;
+ font-size: 36px;
+}
+
+.image {
+ width: 213px;
+ height: 123px;
+}
diff --git a/frontend/src/Settings/MetadataSource/TheTvdb.js b/frontend/src/Settings/MetadataSource/TheTvdb.js
new file mode 100644
index 000000000..7add9322c
--- /dev/null
+++ b/frontend/src/Settings/MetadataSource/TheTvdb.js
@@ -0,0 +1,27 @@
+import React from 'react';
+import Link from 'Components/Link/Link';
+import styles from './TheTvdb.css';
+
+function TheTvdb(props) {
+ return (
+
+
+
+
+
+ TheTVDB
+
+
+
+ Series and episode information is provided by TheTVDB.com. Please consider supporting them.
+
+
+
+
+ );
+}
+
+export default TheTvdb;
diff --git a/frontend/src/Settings/Settings.js b/frontend/src/Settings/Settings.js
index a7c81db13..dfcda1851 100644
--- a/frontend/src/Settings/Settings.js
+++ b/frontend/src/Settings/Settings.js
@@ -108,6 +108,13 @@ function Settings() {
Metadata
+
+ Metadata Source
+
+
Create metadata files when episodes are imported or series are refreshed
diff --git a/frontend/src/Styles/Themes/dark.js b/frontend/src/Styles/Themes/dark.js
index 0c6c531e9..90cf459e2 100644
--- a/frontend/src/Styles/Themes/dark.js
+++ b/frontend/src/Styles/Themes/dark.js
@@ -1,5 +1,6 @@
const sonarrBlue = '#35c5f4';
const darkGray = '#888';
+const mediumGray = '#999';
const gray = '#adadad';
const black = '#000';
const white = '#fff';
@@ -29,6 +30,7 @@ module.exports = {
darkGray,
gray,
lightGray,
+ mediumGray,
// Theme Colors
diff --git a/frontend/src/Styles/Themes/light.js b/frontend/src/Styles/Themes/light.js
index 376312264..03b63489c 100644
--- a/frontend/src/Styles/Themes/light.js
+++ b/frontend/src/Styles/Themes/light.js
@@ -1,6 +1,7 @@
const sonarrBlue = '#35c5f4';
const sonarrAlternateBlue = '#2193b5';
const darkGray = '#888';
+const mediumGray = '#999';
const gray = '#adadad';
const black = '#000';
const white = '#fff';
@@ -31,6 +32,7 @@ module.exports = {
darkGray,
gray,
lightGray,
+ mediumGray,
// Theme Colors