diff --git a/data/interfaces/default/images/libraries/artist.png b/data/interfaces/default/images/libraries/artist.png new file mode 100644 index 00000000..10a67be0 Binary files /dev/null and b/data/interfaces/default/images/libraries/artist.png differ diff --git a/data/interfaces/default/images/libraries/movie.png b/data/interfaces/default/images/libraries/movie.png new file mode 100644 index 00000000..6510383d Binary files /dev/null and b/data/interfaces/default/images/libraries/movie.png differ diff --git a/data/interfaces/default/images/libraries/photo.png b/data/interfaces/default/images/libraries/photo.png new file mode 100644 index 00000000..b9e48a85 Binary files /dev/null and b/data/interfaces/default/images/libraries/photo.png differ diff --git a/data/interfaces/default/images/libraries/playlist.png b/data/interfaces/default/images/libraries/playlist.png new file mode 100644 index 00000000..c52df8a1 Binary files /dev/null and b/data/interfaces/default/images/libraries/playlist.png differ diff --git a/data/interfaces/default/images/libraries/show.png b/data/interfaces/default/images/libraries/show.png new file mode 100644 index 00000000..6b54f49b Binary files /dev/null and b/data/interfaces/default/images/libraries/show.png differ diff --git a/data/interfaces/default/images/libraries/video.png b/data/interfaces/default/images/libraries/video.png new file mode 100644 index 00000000..d73aa7f9 Binary files /dev/null and b/data/interfaces/default/images/libraries/video.png differ diff --git a/data/interfaces/default/images/newsletter/newsletter-header.png b/data/interfaces/default/images/newsletter/newsletter-header.png new file mode 100644 index 00000000..ab7dddec Binary files /dev/null and b/data/interfaces/default/images/newsletter/newsletter-header.png differ diff --git a/data/interfaces/default/images/newsletter/view-on-plex-flat.png b/data/interfaces/default/images/newsletter/view-on-plex-flat.png new file mode 100644 index 00000000..6875a4e8 Binary files /dev/null and b/data/interfaces/default/images/newsletter/view-on-plex-flat.png differ diff --git a/data/interfaces/default/newsletter_preview.html b/data/interfaces/default/newsletter_preview.html index 61219ea4..a08b2543 100644 --- a/data/interfaces/default/newsletter_preview.html +++ b/data/interfaces/default/newsletter_preview.html @@ -4,21 +4,52 @@ Tautulli - ${title} | ${server_name} - - -
-   Generating Newsletter
+ +
+ Generating Newsletter +
Please wait, this may take a few minutes...
diff --git a/data/interfaces/newsletters/recently_added.html b/data/interfaces/newsletters/recently_added.html index 8d154bd0..84b32f26 100644 --- a/data/interfaces/newsletters/recently_added.html +++ b/data/interfaces/newsletters/recently_added.html @@ -27,7 +27,7 @@ } body { - font-family: sans-serif; + font-family: 'Open Sans', Helvetica, Arial, sans-serif; -webkit-font-smoothing: antialiased; font-size: 14px; line-height: 1.4; @@ -45,7 +45,7 @@ } table td { - font-family: sans-serif; + font-family: 'Open Sans', Helvetica, Arial, sans-serif; font-size: 14px; vertical-align: top; } @@ -130,7 +130,7 @@ h3, h4 { color: #ffffff; - font-family: sans-serif; + font-family: 'Open Sans', Helvetica, Arial, sans-serif; font-weight: 400; margin: 0; } @@ -138,7 +138,7 @@ p, ul, ol { - font-family: sans-serif; + font-family: 'Open Sans', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: 400; margin: 0; @@ -271,7 +271,7 @@ HEADER ------------------------------------- */ .header { - background: url(https://i.imgur.com/oqMQJxp.png) no-repeat; + background-repeat: no-repeat; background-position: calc(50% - 20px) 50%; background-size: contain; width: 100%; @@ -379,14 +379,15 @@ height: 150px; } .card-poster { - background-color: #282828; + background-color: #3F4245; background-position: center; background-size: cover; height: 100%; width: 100%; } .card-poster-overlay { - background: url(https://cdn.discordapp.com/attachments/334355557706235906/401064397780287489/newsletter-view-on-plex-flat.png) bottom right no-repeat; + background-repeat: no-repeat; + background-position: bottom right; width: 100%; height: 100%; } @@ -582,7 +583,7 @@ -
+
${parameters['server_name']}
${parameters['start_date']} - ${parameters['end_date']}
@@ -594,7 +595,7 @@
- Recently Added Movies + Recently Added Movies
${len(recently_added['movie'])} movie${'s' if len(recently_added['movie']) > 1 else ''} @@ -616,7 +617,7 @@
-
+
@@ -666,7 +667,7 @@
- Recently Added TV Shows + Recently Added TV Shows
${len(recently_added['show'])} show${'s' if len(recently_added['show']) > 1 else ''} / @@ -697,7 +698,7 @@
-
+
@@ -774,7 +775,7 @@
- Recently Added Music + Recently Added Music
${len(recently_added['artist'])} artist${'s' if len(recently_added['artist']) > 1 else ''} / @@ -802,7 +803,7 @@
-
+
diff --git a/data/interfaces/newsletters/recently_added_master.html b/data/interfaces/newsletters/recently_added_master.html index 245fbd79..d6cf93d6 100644 --- a/data/interfaces/newsletters/recently_added_master.html +++ b/data/interfaces/newsletters/recently_added_master.html @@ -271,7 +271,7 @@ HEADER ------------------------------------- */ .header { - background: url(https://i.imgur.com/oqMQJxp.png) no-repeat; + background-repeat: no-repeat; background-position: calc(50% - 20px) 50%; background-size: contain; width: 100%; @@ -386,7 +386,8 @@ width: 100%; } .card-poster-overlay { - background: url(https://cdn.discordapp.com/attachments/334355557706235906/401064397780287489/newsletter-view-on-plex-flat.png) bottom right no-repeat; + background-repeat: no-repeat; + background-position: bottom right; width: 100%; height: 100%; } @@ -582,7 +583,7 @@ -
+
${parameters['server_name']}
${parameters['start_date']} - ${parameters['end_date']}
@@ -594,7 +595,7 @@
- Recently Added Movies + Recently Added Movies
${len(recently_added['movie'])} movie${'s' if len(recently_added['movie']) > 1 else ''} @@ -616,7 +617,7 @@
-
+
@@ -666,7 +667,7 @@
- Recently Added TV Shows + Recently Added TV Shows
${len(recently_added['show'])} show${'s' if len(recently_added['show']) > 1 else ''} / @@ -697,7 +698,7 @@
-
+
@@ -774,7 +775,7 @@
- Recently Added Music + Recently Added Music
${len(recently_added['artist'])} artist${'s' if len(recently_added['artist']) > 1 else ''} / @@ -802,7 +803,7 @@
-
+
diff --git a/plexpy/webserve.py b/plexpy/webserve.py index acfc2b32..8ab71acb 100644 --- a/plexpy/webserve.py +++ b/plexpy/webserve.py @@ -5602,6 +5602,10 @@ class WebInterface(object): def newsletter(self, *args, **kwargs): if args: if len(args) >= 2 and args[0] == 'image': + if args[1] == 'images': + resource_dir = os.path.join(str(plexpy.PROG_DIR), 'data/interfaces/default/') + return serve_file(path=os.path.join(resource_dir, *args[1:]), content_type='image/png') + return self.image(args[1], refresh=True) newsletter_uuid = args[0]