anonfunc/JellyPy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Newsletter preview by default

Browse Source
This commit is contained in:
JonnyWong16
2018-02-11 22:48:26 -08:00
parent 9aff61f670
commit afa16cd656
3 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/interfaces/default/newsletter_config.html
View File

@@ -525,7 +525,7 @@
function previewNewsletter() { function previewNewsletter() {
showMsg('<i class="fa fa-check"></i>&nbsp; Check pop-up blocker if no response.', false, true, 2000); showMsg('<i class="fa fa-check"></i>&nbsp; Check pop-up blocker if no response.', false, true, 2000);
window.open('newsletter?newsletter_id=' + $('#newsletter_id').val() + '&preview=true'); window.open('newsletter?newsletter_id=' + $('#newsletter_id').val());
} }
function sendTestNewsletter() { function sendTestNewsletter() {

2
data/interfaces/default/newsletter_preview.html
View File

@@ -27,7 +27,7 @@
<script> <script>
$(document).ready(function () { $(document).ready(function () {
var frame = $('<iframe></iframe>', { var frame = $('<iframe></iframe>', {
src: 'real_newsletter?newsletter_id=${newsletter_id}&preview=${preview}&master=${master}&raw=${raw}', src: 'real_newsletter?newsletter_id=${newsletter_id}&preview=true',
frameborder: '0', frameborder: '0',
style: 'display: none; height: 100vh; width: 100vw;' style: 'display: none; height: 100vh; width: 100vw;'
}); });

7
plexpy/webserve.py
View File

@@ -5490,13 +5490,10 @@ class WebInterface(object):
@cherrypy.expose @cherrypy.expose
@requireAuth(member_of("admin")) @requireAuth(member_of("admin"))
def newsletter(self, newsletter_id=None, preview=False, master=False, raw=False, **kwargs): def newsletter(self, newsletter_id=None, **kwargs):
return serve_template(templatename="newsletter_preview.html", return serve_template(templatename="newsletter_preview.html",
title="Newsletter", title="Newsletter",
newsletter_id=newsletter_id, newsletter_id=newsletter_id)
preview=preview,
master=master,
raw=raw)
@cherrypy.expose @cherrypy.expose
@requireAuth(member_of("admin")) @requireAuth(member_of("admin"))