diff options
| author | rpiazzi <rpiazzi@7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c> | 2011-10-07 14:24:46 +0000 |
|---|---|---|
| committer | rpiazzi <rpiazzi@7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c> | 2011-10-07 14:24:46 +0000 |
| commit | 4867c4b3fc2db0845be9ca517b3d20e77b94d977 (patch) | |
| tree | 710dc57677ef9d7593c06b7370e984313fef76ea /pdf-as-web | |
| parent | 40f4c479dccda8fb16fa6027fb271d40f7f4dfa7 (diff) | |
| download | pdf-as-3-4867c4b3fc2db0845be9ca517b3d20e77b94d977.tar.gz pdf-as-3-4867c4b3fc2db0845be9ca517b3d20e77b94d977.tar.bz2 pdf-as-3-4867c4b3fc2db0845be9ca517b3d20e77b94d977.zip | |
Added condition for the case when mobile CCS is canceled. In this case the parameter error_within_iframe is true, but because of the redirecttarget parameter the application goes out of iframe. For this the backgrounnd template etc. have to be shown.
git-svn-id: https://joinup.ec.europa.eu/svn/pdf-as/trunk@856 7b5415b0-85f9-ee4d-85bd-d5d0c3b42d1c
Diffstat (limited to 'pdf-as-web')
| -rw-r--r-- | pdf-as-web/src/main/webapp/jsp/error.jsp | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/pdf-as-web/src/main/webapp/jsp/error.jsp b/pdf-as-web/src/main/webapp/jsp/error.jsp index 7a5e970..c0f9977 100644 --- a/pdf-as-web/src/main/webapp/jsp/error.jsp +++ b/pdf-as-web/src/main/webapp/jsp/error.jsp @@ -72,9 +72,11 @@ %>
<%
- //If not within IFrame and the whole application also was not started within an IFrame
+ //First part: if not within IFrame and the whole application also was not started within an IFrame
//we have to set the buergerkarte page as template
- if ((!withiniframe) && (!startedFromIFrame)) {
+ //Second part is because mobile has redirect target _top and in case of cancel it would be redirected
+ //from what this prevents
+ if (((!withiniframe) && (!startedFromIFrame)) || ((!startedFromIFrame) && (((String)request.getAttribute("cause")).contains("Abbruch durch den Bürger über die Benutzerschnittstelle")))) {
if (german) { %>
<meta name="decorator" content="production_de" />
<% } else { %>
@@ -91,7 +93,7 @@ //If the whole application started from an IFrame there could be an external stylesheet
if (!startedFromIFrame) { %>
<link rel="stylesheet" type="text/css" href="<%=baseUrl%>/css/pdfas-styles.css" />
- <link rel="stylesheet" href="<%=serverUrl%>/style.css" type="text/css" />
+ <link rel="stylesheet" href="<%=serverUrl%>style.css" type="text/css" />
<% } else { %>
<link rel="stylesheet" type="text/css" href="<%=baseUrl%>/css/extern-styles.css" />
<% } %>
@@ -188,13 +190,14 @@ //If application not started within an iframe
if (!startedFromIFrame) { %>
<%
- //If error didn't happen within IFrame (e.g. when online bku is called)
- //The whole site has to be shown
- if (!withiniframe) { %>
+ //First condition: if error didn't happen within IFrame (e.g. when local bku is called) the whole site has to be shown
+ //Second condition is because mobile has to have redirect target _top to redirect
+ //in case of successfull signature. But because of this also in case of cancel redirects
+ if ((!withiniframe) || (cause.contains("Abbruch durch den Bürger über die Benutzerschnittstelle"))) { %>
<body style="background: #e6f2fa">
<h1 id="heading1" style="display:block">
<%
- if (testMode) {
+ if ((testMode) ) {
%>
<fmt:message key="test.common.title"/>
<% } else { %>
|