From 49e49e58f97d16f3cd185f46f5ba1817c44b98b2 Mon Sep 17 00:00:00 2001 From: Andreas Fitzek Date: Tue, 1 Sep 2015 13:19:20 +0200 Subject: send post message to parent in result page Conflicts: pdf-as-web/src/main/resources/template_provide.html --- .../at/gv/egiz/pdfas/web/servlets/ErrorPage.java | 3 +++ .../egiz/pdfas/web/servlets/ProvidePDFServlet.java | 2 ++ pdf-as-web/src/main/resources/template_error.html | 16 ++++++++++++++++ pdf-as-web/src/main/resources/template_provide.html | 21 ++++++++++++++++++++- 4 files changed, 41 insertions(+), 1 deletion(-) diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ErrorPage.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ErrorPage.java index 670756de..2afc811c 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ErrorPage.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ErrorPage.java @@ -55,6 +55,7 @@ public class ErrorPage extends HttpServlet { private static final String ERROR_STACK = "##ERROR_STACK##"; private static final String ERROR_MESSAGE = "##ERROR_MESSAGE##"; + private static final String PUBLIC_URL = "##PUBLICURL##"; /** * @see HttpServlet#HttpServlet() @@ -164,6 +165,8 @@ public class ErrorPage extends HttpServlet { template = template.replace(ERROR_STACK, ""); } + template = template.replace(PUBLIC_URL, WebConfiguration.getPublicURL()); + response.setContentType("text/html"); response.getWriter().write(template); response.getWriter().close(); diff --git a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ProvidePDFServlet.java b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ProvidePDFServlet.java index 7909e926..8a23b132 100644 --- a/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ProvidePDFServlet.java +++ b/pdf-as-web/src/main/java/at/gv/egiz/pdfas/web/servlets/ProvidePDFServlet.java @@ -50,6 +50,7 @@ public class ProvidePDFServlet extends HttpServlet { .getLogger(ProvidePDFServlet.class); private static final String PDF_DATA_URL = "##PDFDATAURL##"; + private static final String PUBLIC_URL = "##PUBLICURL##"; /** * @see HttpServlet#HttpServlet() @@ -89,6 +90,7 @@ public class ProvidePDFServlet extends HttpServlet { String template = PdfAsHelper.getProvideTemplate(); template = template.replace(PDF_DATA_URL, PdfAsHelper.generatePdfURL(request, response)); + template = template.replace(PUBLIC_URL, WebConfiguration.getPublicURL()); // Deliver to Browser directly! response.setContentType("text/html"); response.getWriter().write(template); diff --git a/pdf-as-web/src/main/resources/template_error.html b/pdf-as-web/src/main/resources/template_error.html index 0371c568..87992c42 100644 --- a/pdf-as-web/src/main/resources/template_error.html +++ b/pdf-as-web/src/main/resources/template_error.html @@ -7,5 +7,21 @@ Error Page:

##ERROR_MESSAGE##

##ERROR_STACK##

+ diff --git a/pdf-as-web/src/main/resources/template_provide.html b/pdf-as-web/src/main/resources/template_provide.html index 8016be07..1ff00d15 100644 --- a/pdf-as-web/src/main/resources/template_provide.html +++ b/pdf-as-web/src/main/resources/template_provide.html @@ -1 +1,20 @@ -##PDFDATAURL## \ No newline at end of file + + + +Provide PDF + + +PDF ready @: download here + + + + -- cgit v1.2.3