aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrpiazzi <rpiazzi@7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c>2011-09-23 15:09:53 +0000
committerrpiazzi <rpiazzi@7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c>2011-09-23 15:09:53 +0000
commit518295b9b95a552795bda62a442d59b897b91737 (patch)
treecb8941814d181272f4f6e8a100802a486c72d0a2
parentf38a65ed16cd68024da49f913e2d6fea9cadbbe6 (diff)
downloadpdf-as-3-518295b9b95a552795bda62a442d59b897b91737.tar.gz
pdf-as-3-518295b9b95a552795bda62a442d59b897b91737.tar.bz2
pdf-as-3-518295b9b95a552795bda62a442d59b897b91737.zip
Changes to take into account the possibility for calling the whole application within an IFrame from an external application (see also other jsp's).
git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@821 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c
-rw-r--r--pdf-as-web/src/main/webapp/jsp/please_wait.jsp70
1 files changed, 62 insertions, 8 deletions
diff --git a/pdf-as-web/src/main/webapp/jsp/please_wait.jsp b/pdf-as-web/src/main/webapp/jsp/please_wait.jsp
index 62c0d28..03e85a2 100644
--- a/pdf-as-web/src/main/webapp/jsp/please_wait.jsp
+++ b/pdf-as-web/src/main/webapp/jsp/please_wait.jsp
@@ -1,16 +1,70 @@
<%@ page contentType="text/html; charset=UTF-8" language="java" errorPage=""%>
+<%@ page import="at.gv.egiz.pdfas.web.helper.LocalRequestHelper" %>
+<%@page import="at.gv.egiz.pdfas.web.servlets.SignServlet"%>
+<%@ page import="at.gv.egiz.pdfas.web.session.SessionAttributes" %>
<%@ include file="language.jsp" %>
+<html>
+
<head>
+
+ <%
+
+ //Check if application is started within an iframe from an extern application
+ String extern = (String)request.getParameter("extern");
+ boolean startedFromIFrame = false;
+
+ if (extern !=null) {
+ if (extern.equals("yes")) {
+ startedFromIFrame = true;
+ }
+ }
+
+ //That the appication is entered into the IFrame now is sure
+ session.setAttribute(SignServlet.ERROR_WITHIN_IFRAME, "yes");
+
+ String language = (String)session.getAttribute(SessionAttributes.LANGUAGE);
+ if (language!=null) {
+ if (language.equals("de")) {%>
+ <fmt:setLocale value="de"/>
+ <% } else { %>
+ <fmt:setLocale value="en"/>
+ <% }
+ } else { %>
+ <fmt:setLocale value="de"/>
+ <% }
+
+ //Depending on the fact if application is called within an IFrame or normally
+ //the styles would be different
+ if (!startedFromIFrame) { %>
+ <link rel="stylesheet" type="text/css" href="https://www.buergerkarte.at/test-pdf-as/css/pdfas-styles.css" />
+ <link rel="stylesheet" href="https://www.buergerkarte.at/style.css" type="text/css" />
+ <% } else { %>
+ <link rel="stylesheet" type="text/css" href="https://www.buergerkarte.at/test-pdf-as/css/extern-styles.css" />
+ <% } %>
+
<meta http-equiv="content-type" content="text/html; charset=UTF-8" />
- <title><fmt:message key="pleasewait.title"/></title>
+ <title>
+ <fmt:message key="pleasewait.title"/>
+ </title>
+
+
+
</head>
+<% if (!startedFromIFrame) { %>
+ <body style="background: #e6f2fa">
+ <div class="pleasewaitbody">
+ <fmt:message key="pleasewait.body"/>
+ </div>
+ </body>
+<% } else { %>
+ <body>
+ <div class="pleasewaitbody">
+ <fmt:message key="pleasewait.body"/>
+ </div>
+ </body>
+<% } %>
+
-<body>
- <table cellpadding="0" cellspacing="0" border="0" width="100%" height="100%">
- <tr height="100%" valign="middle">
- <td align="center"><fmt:message key="pleasewait.body"/></td>
- </tr>
- </table>
-</body>
+</html>