diff --git a/data/interfaces/default/settings.html b/data/interfaces/default/settings.html index 63bca16b..3bd177b6 100644 --- a/data/interfaces/default/settings.html +++ b/data/interfaces/default/settings.html @@ -971,6 +971,15 @@

Warning: Public Tautulli domain not set under Web Interface.

+
+ +

+ Enable to use newsletter templates with inline CSS styles. Inline styles render better in email clients, but are larger in size which may cause long newsletters to be clipped.
+ Note: This setting does not affect custom templates. CSS styles will depend on your own template. +

+
diff --git a/data/interfaces/newsletters/recently_added.html b/data/interfaces/newsletters/recently_added.html index 203f0052..ea489e42 100644 --- a/data/interfaces/newsletters/recently_added.html +++ b/data/interfaces/newsletters/recently_added.html @@ -23,8 +23,8 @@ - - + + Tautulli Newsletter - ${subject} - + % if preview and service and service != 'self-hosted': -

Note: Local preview images only - images will be uploaded to ${service.capitalize()} when the newsletter is sent.

+

Note: Local preview images only - images will be uploaded to ${service.capitalize()} when the newsletter is sent.

% elif preview and not service: -

Warning: The Image Hosting setting must be enabled for images to display on the newsletter.

+

Warning: The Image Hosting setting must be enabled for images to display on the newsletter.

% endif - +
-
-
- Tautulli Newsletter - ${subject} +
+
+ % if base_url and not preview: -
- Click here to view the full newsletter. +
+ Click here to view the full newsletter.
% endif - +
- % if message: - % endif % if recently_added.get('movie'): - -
-
- +
+
+
-
${parameters['server_name']}
-
${parameters['start_date']} - ${parameters['end_date']}
+
${parameters['server_name']}
+
${parameters['start_date']} - ${parameters['end_date']}
-
-
${'
'.join(l for l in message.splitlines()) | n}
+ 		+
+
${'
'.join(l for l in message.splitlines()) | n}
-
-
- Recently Added Movies +
+
+
+ Recently Added Movies
-
- ${len(recently_added['movie'])} movie${'s' if len(recently_added['movie']) > 1 else ''} +
+ ${len(recently_added['movie'])} movie${'s' if len(recently_added['movie']) > 1 else ''}
- +
+ % for movie_a, movie_b in grouper(recently_added['movie'], 2): -
- +
+ % for movie in (movie_a, movie_b): % if movie: % if not movie_b: - + % endif -
- +
+ -
- + -
+ -
- - + + +
- +
+ - - -
- ${movie['title']} + + ${movie['title']}
+ % if movie['tagline']: -

+

${movie['tagline']}

% endif -

+

${movie['summary'][:450] + (movie['summary'][450:] and '...')}

- +
+ -
- +
+ % if movie['year']: - + % endif % if movie['duration']: <% duration = int(int(movie['duration'])/60000) %> - + % endif % if movie['genres']: % for genre in movie['genres'][:]: - + % endfor % endif @@ -648,14 +647,14 @@ % if movie['rating']: <% rating = int(round(float(movie['rating']) / 2)) %> - % if not movie_b: - + % endif % endif % endfor @@ -686,30 +685,30 @@ % endif % if recently_added.get('show'): - -
${movie['year']}${movie['year']}${duration} mins${duration} mins${genre}${genre}
- +
+ % for _ in range(rating): - + % endfor % for _ in range(5-rating): - + % endfor
★★☆☆
@@ -671,7 +670,7 @@
-
-
- Recently Added TV Shows +
+
+
+ Recently Added TV Shows
-
- ${len(recently_added['show'])} show${'s' if len(recently_added['show']) > 1 else ''} / +
+ ${len(recently_added['show'])} show${'s' if len(recently_added['show']) > 1 else ''} / <% total_episodes = sum(season['episode_count'] for show in recently_added['show'] for season in show['season']) %> - ${total_episodes} episode${'s' if total > 1 else ''} + ${total_episodes} episode${'s' if total > 1 else ''}
- +
+ % for show_a, show_b in grouper(recently_added['show'], 2): -
- +
+ % for show in (show_a, show_b): % if show: % if not show_b: - + % endif <% if show['season_count'] == 1: @@ -720,37 +719,37 @@ else: link_rating_key = show['rating_key'] %> -
- +
+ -
- + -
+ -
- - + + +
- +
+ - - -
- ${show['title']} + + ${show['title']}
-

+

+

% if show['season_count'] > 1: ${show['season_count']} seasons / % endif <% total_show_episodes = sum(s['episode_count'] for s in show['season']) %> ${total_show_episodes} episode${'s' if total_show_episodes > 1 else ''}

-

+

% for i, season in enumerate(show['season'][:8]): % if season['episode_count'] == 1: Season ${season['media_index']} · Episode ${season['episode'][0]['media_index']} - ${season['episode'][0]['title']} @@ -764,7 +763,7 @@ % endif % endfor

-

+

% if show['season_count'] == 1 and show['season'][0]['episode_count'] == 1: ${show['season'][0]['episode'][0]['summary'][:350] + (show['season'][0]['episode'][0]['summary'][350:] and '...')} % else: @@ -777,22 +776,22 @@

- +
+ -
- +
+ % if show['year']: - + % endif % if show['duration']: <% duration = int(int(show['duration'])/60000) %> - + % endif % if show['genres']: % for genre in show['genres'][:2]: - + % endfor % endif @@ -800,14 +799,14 @@ % if show['rating']: <% rating = int(round(float(show['rating']) / 2)) %> - % if not show_b: - + % endif % endif % endfor @@ -838,77 +837,77 @@ % endif % if recently_added.get('artist'): - -
${show['year']}${show['year']}${duration} mins${duration} mins${genre}${genre}
- +
+ % for _ in range(rating): - + % endfor % for _ in range(5-rating): - + % endfor
★★☆☆
@@ -823,7 +822,7 @@
-
-
- Recently Added Music +
+
+
+ Recently Added Music
-
- ${len(recently_added['artist'])} artist${'s' if len(recently_added['artist']) > 1 else ''} / +
+ ${len(recently_added['artist'])} artist${'s' if len(recently_added['artist']) > 1 else ''} / <% total_albums = sum(artist['album_count'] for artist in recently_added['artist']) %> - ${total_albums} album${'s' if total > 1 else ''} + ${total_albums} album${'s' if total > 1 else ''}
- +
+ % for album_a, album_b in grouper([a for artist in recently_added['artist'] for a in artist['album']], 2): -
- +
+ % for album in (album_a, album_b): % if album: % if not album_b: - + % endif -
- +
+ -
- + -
+ -
- - + + +
- +
+ - - -
- ${album['title']} + + ${album['title']}
-

+

+

${album['parent_title']} · ${album['track_count']} track${'s' if album['track_count'] > 1 else ''}

% if artist['title'].lower() != 'various artists': -

+

${album['summary'][:200] + (album['summary'][200:] and '...')}

% endif
- +
+ -
- +
+ % if album['year']: - + % endif % if album['genres']: % for genre in album['genres'][:2]: - + % endfor % endif @@ -916,14 +915,14 @@ % if album['rating']: <% rating = int(round(float(album['rating']) / 2)) %> - % if not album_b: - + % endif % endif % endfor @@ -953,10 +952,10 @@ % endif - diff --git a/data/interfaces/newsletters/recently_added.inline.html b/data/interfaces/newsletters/recently_added.internal.html similarity index 63% rename from data/interfaces/newsletters/recently_added.inline.html rename to data/interfaces/newsletters/recently_added.internal.html index ea489e42..203f0052 100644 --- a/data/interfaces/newsletters/recently_added.inline.html +++ b/data/interfaces/newsletters/recently_added.internal.html @@ -23,8 +23,8 @@ - - + + Tautulli Newsletter - ${subject} - + % if preview and service and service != 'self-hosted': -

Note: Local preview images only - images will be uploaded to ${service.capitalize()} when the newsletter is sent.

+

Note: Local preview images only - images will be uploaded to ${service.capitalize()} when the newsletter is sent.

% elif preview and not service: -

Warning: The Image Hosting setting must be enabled for images to display on the newsletter.

+

Warning: The Image Hosting setting must be enabled for images to display on the newsletter.

% endif -
${album['year']}${album['year']}${genre}${genre}
- +
+ % for _ in range(rating): - + % endfor % for _ in range(5-rating): - + % endfor
★★☆☆
@@ -939,7 +938,7 @@
-
-
- Newsletter generated by Tautulli. +
+
+
+ Newsletter generated by Tautulli.
+
-
-
- +
+
+ Tautulli Newsletter - ${subject} % if base_url and not preview: -
- Click here to view the full newsletter. +
+ Click here to view the full newsletter.
% endif - +
- % if message: - % endif % if recently_added.get('movie'): - -
-
- +
+
+
-
${parameters['server_name']}
-
${parameters['start_date']} - ${parameters['end_date']}
+
${parameters['server_name']}
+
${parameters['start_date']} - ${parameters['end_date']}
-
-
${'
'.join(l for l in message.splitlines()) | n}
+ 		+
+
${'
'.join(l for l in message.splitlines()) | n}
-
-
- Recently Added Movies +
+
+
+ Recently Added Movies
-
- ${len(recently_added['movie'])} movie${'s' if len(recently_added['movie']) > 1 else ''} +
+ ${len(recently_added['movie'])} movie${'s' if len(recently_added['movie']) > 1 else ''}
- +
+ % for movie_a, movie_b in grouper(recently_added['movie'], 2): -
- +
+ % for movie in (movie_a, movie_b): % if movie: % if not movie_b: - + % endif -
- +
+ -
- + -
+ -
- - + + +
- +
+ - - -
- ${movie['title']} + + ${movie['title']}
+ % if movie['tagline']: -

+

${movie['tagline']}

% endif -

+

${movie['summary'][:450] + (movie['summary'][450:] and '...')}

- +
+ -
- +
+ % if movie['year']: - + % endif % if movie['duration']: <% duration = int(int(movie['duration'])/60000) %> - + % endif % if movie['genres']: % for genre in movie['genres'][:]: - + % endfor % endif @@ -647,14 +648,14 @@ % if movie['rating']: <% rating = int(round(float(movie['rating']) / 2)) %> - % if not movie_b: - + % endif % endif % endfor @@ -685,30 +686,30 @@ % endif % if recently_added.get('show'): - -
${movie['year']}${movie['year']}${duration} mins${duration} mins${genre}${genre}
- +
+ % for _ in range(rating): - + % endfor % for _ in range(5-rating): - + % endfor
★★☆☆
@@ -670,7 +671,7 @@
-
-
- Recently Added TV Shows +
+
+
+ Recently Added TV Shows
-
- ${len(recently_added['show'])} show${'s' if len(recently_added['show']) > 1 else ''} / +
+ ${len(recently_added['show'])} show${'s' if len(recently_added['show']) > 1 else ''} / <% total_episodes = sum(season['episode_count'] for show in recently_added['show'] for season in show['season']) %> - ${total_episodes} episode${'s' if total > 1 else ''} + ${total_episodes} episode${'s' if total > 1 else ''}
- +
+ % for show_a, show_b in grouper(recently_added['show'], 2): -
- +
+ % for show in (show_a, show_b): % if show: % if not show_b: - + % endif <% if show['season_count'] == 1: @@ -719,37 +720,37 @@ else: link_rating_key = show['rating_key'] %> -
- +
+ -
- + -
+ -
- - + + +
- +
+ - - -
- ${show['title']} + + ${show['title']}
-

+

+

% if show['season_count'] > 1: ${show['season_count']} seasons / % endif <% total_show_episodes = sum(s['episode_count'] for s in show['season']) %> ${total_show_episodes} episode${'s' if total_show_episodes > 1 else ''}

-

+

% for i, season in enumerate(show['season'][:8]): % if season['episode_count'] == 1: Season ${season['media_index']} · Episode ${season['episode'][0]['media_index']} - ${season['episode'][0]['title']} @@ -763,7 +764,7 @@ % endif % endfor

-

+

% if show['season_count'] == 1 and show['season'][0]['episode_count'] == 1: ${show['season'][0]['episode'][0]['summary'][:350] + (show['season'][0]['episode'][0]['summary'][350:] and '...')} % else: @@ -776,22 +777,22 @@

- +
+ -
- +
+ % if show['year']: - + % endif % if show['duration']: <% duration = int(int(show['duration'])/60000) %> - + % endif % if show['genres']: % for genre in show['genres'][:2]: - + % endfor % endif @@ -799,14 +800,14 @@ % if show['rating']: <% rating = int(round(float(show['rating']) / 2)) %> - % if not show_b: - + % endif % endif % endfor @@ -837,77 +838,77 @@ % endif % if recently_added.get('artist'): - -
${show['year']}${show['year']}${duration} mins${duration} mins${genre}${genre}
- +
+ % for _ in range(rating): - + % endfor % for _ in range(5-rating): - + % endfor
★★☆☆
@@ -822,7 +823,7 @@
-
-
- Recently Added Music +
+
+
+ Recently Added Music
-
- ${len(recently_added['artist'])} artist${'s' if len(recently_added['artist']) > 1 else ''} / +
+ ${len(recently_added['artist'])} artist${'s' if len(recently_added['artist']) > 1 else ''} / <% total_albums = sum(artist['album_count'] for artist in recently_added['artist']) %> - ${total_albums} album${'s' if total > 1 else ''} + ${total_albums} album${'s' if total > 1 else ''}
- +
+ % for album_a, album_b in grouper([a for artist in recently_added['artist'] for a in artist['album']], 2): -
- +
+ % for album in (album_a, album_b): % if album: % if not album_b: - + % endif -
- +
+ -
- + -
+ -
- - + + +
- +
+ - - -
- ${album['title']} + + ${album['title']}
-

+

+

${album['parent_title']} · ${album['track_count']} track${'s' if album['track_count'] > 1 else ''}

% if artist['title'].lower() != 'various artists': -

+

${album['summary'][:200] + (album['summary'][200:] and '...')}

% endif
- +
+ -
- +
+ % if album['year']: - + % endif % if album['genres']: % for genre in album['genres'][:2]: - + % endfor % endif @@ -915,14 +916,14 @@ % if album['rating']: <% rating = int(round(float(album['rating']) / 2)) %> - % if not album_b: - + % endif % endif % endfor @@ -952,10 +953,10 @@ % endif - diff --git a/plexpy/config.py b/plexpy/config.py index 0dbc11ee..920e63ac 100644 --- a/plexpy/config.py +++ b/plexpy/config.py @@ -313,6 +313,7 @@ _CONFIG_DEFINITIONS = { 'MONITORING_INTERVAL': (int, 'Monitoring', 60), 'MONITORING_USE_WEBSOCKET': (int, 'Monitoring', 0), 'NEWSLETTER_CUSTOM_DIR': (str, 'Newsletter', ''), + 'NEWSLETTER_INLINE_STYLES': (int, 'Newsletter', 1), 'NEWSLETTER_TEMPLATES': (str, 'Newsletter', 'newsletters'), 'NEWSLETTER_DIR': (str, 'Newsletter', ''), 'NEWSLETTER_SELF_HOSTED': (int, 'Newsletter', 0), diff --git a/plexpy/newsletters.py b/plexpy/newsletters.py index 64c05558..e9c7c494 100644 --- a/plexpy/newsletters.py +++ b/plexpy/newsletters.py @@ -280,6 +280,9 @@ def serve_template(templatename, **kwargs): interface_dir = os.path.join(str(plexpy.PROG_DIR), 'data/interfaces/') template_dir = os.path.join(str(interface_dir), plexpy.CONFIG.NEWSLETTER_TEMPLATES) + if not plexpy.CONFIG.NEWSLETTER_INLINE_STYLES: + templatename = templatename.replace('.html', '.internal.html') + _hplookup = TemplateLookup(directories=[template_dir], default_filters=['unicode', 'h']) try: @@ -597,7 +600,6 @@ class RecentlyAdded(Newsletter): _DEFAULT_SUBJECT = 'Recently Added to {server_name}! ({end_date})' _DEFAULT_BODY = 'View the newsletter here: {newsletter_url}' _DEFAULT_MESSAGE = '' - _TEMPLATE_MASTER = 'recently_added_master.html' _TEMPLATE = 'recently_added.html' def _get_recently_added(self, media_type=None): diff --git a/plexpy/webserve.py b/plexpy/webserve.py index 47a3bef2..5fd77f78 100644 --- a/plexpy/webserve.py +++ b/plexpy/webserve.py @@ -2826,6 +2826,7 @@ class WebInterface(object): "show_advanced_settings": plexpy.CONFIG.SHOW_ADVANCED_SETTINGS, "newsletter_dir": plexpy.CONFIG.NEWSLETTER_DIR, "newsletter_self_hosted": checked(plexpy.CONFIG.NEWSLETTER_SELF_HOSTED), + "newsletter_inline_styles": checked(plexpy.CONFIG.NEWSLETTER_INLINE_STYLES), "newsletter_custom_dir": plexpy.CONFIG.NEWSLETTER_CUSTOM_DIR } @@ -2848,7 +2849,7 @@ class WebInterface(object): "allow_guest_access", "cache_images", "http_proxy", "http_basic_auth", "notify_concurrent_by_ip", "history_table_activity", "plexpy_auto_update", "themoviedb_lookup", "tvmaze_lookup", "http_plex_admin", - "newsletter_self_hosted" + "newsletter_self_hosted", "newsletter_inline_styles" ] for checked_config in checked_configs: if checked_config not in kwargs:
${album['year']}${album['year']}${genre}${genre}
- +
+ % for _ in range(rating): - + % endfor % for _ in range(5-rating): - + % endfor
★★☆☆
@@ -938,7 +939,7 @@
-
-
- Newsletter generated by Tautulli. +
+
+
+ Newsletter generated by Tautulli.