diff options
Diffstat (limited to 'pdf-as-web')
| -rw-r--r-- | pdf-as-web/src/main/webapp/jsp/error.jsp | 31 | 
1 files changed, 6 insertions, 25 deletions
| diff --git a/pdf-as-web/src/main/webapp/jsp/error.jsp b/pdf-as-web/src/main/webapp/jsp/error.jsp index 75830fa..7a5e970 100644 --- a/pdf-as-web/src/main/webapp/jsp/error.jsp +++ b/pdf-as-web/src/main/webapp/jsp/error.jsp @@ -1,7 +1,7 @@  <%@ page isErrorPage="true" %>
  <%@ page import="at.gv.egiz.pdfas.web.helper.LocalRequestHelper" %>
  <%@ page import="at.gv.egiz.pdfas.web.servlets.SignServlet" %>
 -<%@page import="at.gv.egiz.pdfas.api.exceptions.PdfAsException"%>
 +<%@ page import="at.gv.egiz.pdfas.api.exceptions.PdfAsException"%>
  <%@ page import="at.gv.egiz.pdfas.web.session.SignSessionInformation" %>
  <%@ page import="at.gv.egiz.pdfas.web.session.VerifySessionInformation" %>
  <%@ page import="at.gv.egiz.pdfas.web.session.SessionAttributes" %>
 @@ -9,20 +9,17 @@  <%@ page import="org.apache.commons.httpclient.NameValuePair" %>
  <%@ page import="at.gv.egiz.pdfas.web.helper.SignServletHelper" %>
  <%@ page import="org.apache.commons.lang.StringEscapeUtils" %>
 -<%@page import="at.gv.egiz.pdfas.web.FormFields"%>
 +<%@ page import="at.gv.egiz.pdfas.web.FormFields"%>
  <%@ page import="java.io.*" %>
  <%@ page import="at.gv.egiz.pdfas.web.i18n.LocaleParamFilter" %>
  <%@ page import="java.util.Locale" %>
 -<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
 +<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
  <%@ include file="language.jsp" %>
 -<% 
 -%>
 -
  <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  <html>
 @@ -184,12 +181,10 @@  					  }
  					}
  			  }
 -	
 +	  
    	boolean testMode = request.getContextPath().startsWith("/test-");
 -	%>
 -		<% 
  		//If application not started within an iframe
  		if (!startedFromIFrame) { %>
  			<% 
 @@ -214,10 +209,6 @@  					<div id="inhalt">
  						<div class="links" id="errortext">
  							<div class="linksinhaltmargin" id="errortextintern">
 -								<div class="pdfasnote"><fmt:message key="error.number"/>: 
 -									<%= error %>
 -								</div>
 -								<div class="pdfasverticalspace"></div>
  								<div class="pdfasnote"><fmt:message key="error.cause"/>: <strong>
  									<%= cause%>
  								</strong></div>
 @@ -253,12 +244,6 @@  			//Just the error decription has to be shown
  			else { %>
  				<body style="background: #e6f2fa">
 -					<div class="pdfasnote">
 -						<% if (rb) { %>
 -							<fmt:message key="<%= error %>"/>
 -						<% } else { out.write(StringEscapeUtils.escapeHtml(error)); } %>
 -					</div>
 -					<div class="pdfasverticalspace"></div>
  					<div class="pdfasnote"><fmt:message key="error.cause"/>: <strong>
  						<% if (rb) { %>
  							<fmt:message key="<%= cause %>"/>
 @@ -268,7 +253,7 @@  					<% if (!isExternalInvocation && !paramInvok) { %>
  						<a id="backlink" href="<%=baseUrl%>/" target="_top"><fmt:message key="common.back"/></a>
  					<% } // end if %>
 -						<pre style="display:none">
 +					<pre style="display:none">
  					<%
  					 if (pe != null) {
  						StringWriter sw = new StringWriter();
 @@ -281,7 +266,7 @@  					%>
  					</pre>
  					<script language="javascript" type="text/javascript">
 -						window.parent.moveErrorIFrame(document.getElementById('inhalt'));
 +						window.parent.moveErrorIFrame(document.getElementById('inhalt'),"<%=height%>");
  					</script>
  				</body>
  			<% }
 @@ -301,10 +286,6 @@  				<div id="inhalt">
  					<div class="links">
  						<div class="linksinhaltmargin">
 -							<div class="pdfasnote">
 -								<%= error %>
 -							</div>
 -							<div class="pdfaverticalspace"></div>
  							<div class="pdfasnote"><fmt:message key="error.cause"/>: <strong>
  								<%= cause%>
  							</strong></div>
 | 
