diff --git a/data/interfaces/newsletters/recently_added.html b/data/interfaces/newsletters/recently_added.html index 40023310..a66cbf47 100644 --- a/data/interfaces/newsletters/recently_added.html +++ b/data/interfaces/newsletters/recently_added.html @@ -5,11 +5,13 @@ recently_added = data['recently_added'] if plexpy.CONFIG.NEWSLETTER_SELF_HOSTED and plexpy.CONFIG.NEWSLETTER_BASE_URL: - base_url = plexpy.CONFIG.NEWSLETTER_BASE_URL + plexpy.HTTP_ROOT + 'newsletter/image/' - elif plexpy.CONFIG.NEWSLETTER_SELF_HOSTED or preview: - base_url = 'newsletter/image/' + base_url = plexpy.CONFIG.NEWSLETTER_BASE_URL + plexpy.HTTP_ROOT + 'newsletter/' + base_url_image = base_url + 'image/' + elif preview: + base_url = 'newsletter/' + base_url_image = base_url + 'image/' else: - base_url = '' + base_url = base_url_image = '' %> @@ -152,7 +154,6 @@ } a { - color: #3498db; text-decoration: underline; } @@ -264,6 +265,18 @@ width: 0; } + .view-full { + clear: both; + color: #282A2D; + font-size: 12px; + margin-bottom: 10px; + text-align: center; + width: 100%; + } + .view-full a { + color: #282A2D; + } + .powered-by a { text-decoration: underline; } @@ -580,13 +593,19 @@ + % if base_url and not preview: +
+ Click here to view the full newsletter. +
+ % endif +
- Recently Added Movies + Recently Added Movies
${len(recently_added['movie'])} movie${'s' if len(recently_added['movie']) > 1 else ''} @@ -613,16 +632,16 @@ % for movie in (movie_a, movie_b): % if movie:
- +
- +
@@ -634,7 +653,7 @@ @@ -704,7 +723,7 @@
- - + +
- ${movie['title']} + ${movie['title']}
- Recently Added TV Shows + Recently Added TV Shows
${len(recently_added['show'])} show${'s' if len(recently_added['show']) > 1 else ''} / @@ -722,16 +741,16 @@ % for show in (show_a, show_b): % if show:
- +
- +
@@ -743,7 +762,7 @@ @@ -840,7 +859,7 @@
- - + +
- ${show['title']} + ${show['title']}
- Recently Added Music + Recently Added Music
${len(recently_added['artist'])} artist${'s' if len(recently_added['artist']) > 1 else ''} / @@ -858,16 +877,16 @@ % for album in (album_a, album_b): % if album:
- +
- +
@@ -879,7 +898,7 @@ @@ -948,7 +967,7 @@
- Newsletter generated by Tautulli. + Newsletter generated by Tautulli.
diff --git a/data/interfaces/newsletters/recently_added_master.html b/data/interfaces/newsletters/recently_added_master.html index e9eae3b1..1261c1ce 100644 --- a/data/interfaces/newsletters/recently_added_master.html +++ b/data/interfaces/newsletters/recently_added_master.html @@ -5,11 +5,13 @@ recently_added = data['recently_added'] if plexpy.CONFIG.NEWSLETTER_SELF_HOSTED and plexpy.CONFIG.NEWSLETTER_BASE_URL: - base_url = plexpy.CONFIG.NEWSLETTER_BASE_URL + plexpy.HTTP_ROOT + 'newsletter/image/' - elif plexpy.CONFIG.NEWSLETTER_SELF_HOSTED or preview: - base_url = 'newsletter/image/' + base_url = plexpy.CONFIG.NEWSLETTER_BASE_URL + plexpy.HTTP_ROOT + 'newsletter/' + base_url_image = base_url + 'image/' + elif preview: + base_url = 'newsletter/' + base_url_image = base_url + 'image/' else: - base_url = '' + base_url = base_url_image = '' %> @@ -152,7 +154,6 @@ } a { - color: #3498db; text-decoration: underline; } @@ -264,6 +265,18 @@ width: 0; } + .view-full { + clear: both; + color: #282A2D; + font-size: 12px; + margin-bottom: 10px; + text-align: center; + width: 100%; + } + .view-full a { + color: #282A2D; + } + .powered-by a { text-decoration: underline; } @@ -580,13 +593,19 @@ Tautulli Newsletter - ${title} + % if base_url and not preview: +
+ Click here to view the full newsletter. +
+ % endif +
- - + +
- ${album['title']} + ${album['title']}
- Recently Added Movies + Recently Added Movies
${len(recently_added['movie'])} movie${'s' if len(recently_added['movie']) > 1 else ''} @@ -613,16 +632,16 @@ % for movie in (movie_a, movie_b): % if movie:
- +
- +
@@ -704,7 +723,7 @@
- +
- Recently Added TV Shows + Recently Added TV Shows
${len(recently_added['show'])} show${'s' if len(recently_added['show']) > 1 else ''} / @@ -722,16 +741,16 @@ % for show in (show_a, show_b): % if show:
- +
- +
@@ -840,7 +859,7 @@
- +
- Recently Added Music + Recently Added Music
${len(recently_added['artist'])} artist${'s' if len(recently_added['artist']) > 1 else ''} / @@ -858,16 +877,16 @@ % for album in (album_a, album_b): % if album:
- +
- +
diff --git a/plexpy/newsletters.py b/plexpy/newsletters.py index ed822045..0f49589e 100644 --- a/plexpy/newsletters.py +++ b/plexpy/newsletters.py @@ -389,6 +389,7 @@ class Newsletter(object): return serve_template( templatename=template, + uuid=self.uuid, title=self.subject_formatted, parameters=self.parameters, data=self.data, @@ -414,7 +415,9 @@ class Newsletter(object): try: with open(newsletter_file_fp, 'wb') as n_file: - n_file.write(self.newsletter.encode('utf-8')) + for line in self.newsletter.encode('utf-8').splitlines(): + if '' not in line: + n_file.write(line) logger.info(u"Tautulli Newsletters :: %s newsletter saved to %s" % (self.NAME, newsletter_file)) except OSError as e:
- +