From 1a12422908a048347ba97adedf68a7197265c8d1 Mon Sep 17 00:00:00 2001 From: JonnyWong16 Date: Mon, 7 May 2018 18:26:40 -0700 Subject: [PATCH] Show local note on newsletter preview if image hosting enabled --- data/interfaces/newsletters/recently_added.html | 14 +++++++++++++- .../newsletters/recently_added_master.html | 14 +++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/data/interfaces/newsletters/recently_added.html b/data/interfaces/newsletters/recently_added.html index 20dfd0a3..2aac7e4a 100644 --- a/data/interfaces/newsletters/recently_added.html +++ b/data/interfaces/newsletters/recently_added.html @@ -11,9 +11,10 @@ else: base_url = '' + service = get_img_service() if get_img_service(include_self=True) == 'self-hosted' and plexpy.CONFIG.HTTP_BASE_URL: base_url_image = plexpy.CONFIG.HTTP_BASE_URL + plexpy.HTTP_ROOT + 'newsletter/image/' - elif preview: + elif service and preview: base_url_image = 'newsletter/image/' else: base_url_image = '' @@ -89,6 +90,14 @@ /* ------------------------------------- HEADER, FOOTER, MAIN ------------------------------------- */ + .local-preview-note { + text-align: center; + padding-top: 10px; + } + .local-preview-note p { + color: #282A2D; + font-size: 12px; + } .main { background: #282A2D; border-radius: 3px; @@ -614,6 +623,9 @@ +% if preview and service: +

Note: Local preview only - images have not been uploaded to ${service.capitalize()}

+% endif
diff --git a/data/interfaces/newsletters/recently_added_master.html b/data/interfaces/newsletters/recently_added_master.html index c29f8e45..0e74526f 100644 --- a/data/interfaces/newsletters/recently_added_master.html +++ b/data/interfaces/newsletters/recently_added_master.html @@ -11,9 +11,10 @@ else: base_url = '' + service = get_img_service() if get_img_service(include_self=True) == 'self-hosted' and plexpy.CONFIG.HTTP_BASE_URL: base_url_image = plexpy.CONFIG.HTTP_BASE_URL + plexpy.HTTP_ROOT + 'newsletter/image/' - elif preview: + elif service and preview: base_url_image = 'newsletter/image/' else: base_url_image = '' @@ -89,6 +90,14 @@ /* ------------------------------------- HEADER, FOOTER, MAIN ------------------------------------- */ + .local-preview-note { + text-align: center; + padding-top: 10px; + } + .local-preview-note p { + color: #282A2D; + font-size: 12px; + } .main { background: #282A2D; border-radius: 3px; @@ -614,6 +623,9 @@ +% if preview and service: +

Note: Local preview only - images have not been uploaded to ${service.capitalize()}

+% endif