1 files changed, 60 insertions, 44 deletions
diff --git a/BKUOnline/src/main/webapp/local.jsp b/BKUOnline/src/main/webapp/local.jsp
index 48d62674..16e408c0 100644
--- a/BKUOnline/src/main/webapp/local.jsp
+++ b/BKUOnline/src/main/webapp/local.jsp
@@ -14,50 +14,66 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-  pageEncoding="UTF-8" 
-  import="at.gv.egiz.bku.online.webapp.AppletDispatcher,org.apache.commons.lang.RandomStringUtils,org.apache.commons.lang.StringEscapeUtils" %>
-
+<%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<c:set var="defaultWidth" value="190"/>
+<c:set var="defaultHeight" value="130"/>
+<%-- URLs --%>
+<c:url value="/DataURLServer" var="dataUrl"/>
+<%-- Messages --%>
+<fmt:bundle basename="web">
 <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
-   <head>
-       <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-       <title>MOCCA</title>
-       <link rel="shortcut icon" href="img/chip16.ico" type="image/x-icon">
-       <style type="text/css" media="all">@import "css/applet.css";</style>
-
-       <META HTTP-EQUIV="CACHE-CONTROL" CONTENT="NO-CACHE">
-       <META HTTP-EQUIV="EXPIRES" CONTENT="Mon, 22 Jul 2002 11:12:01 GMT">
-       <META HTTP-EQUIV="PRAGMA" CONTENT="NO-CACHE">
-   </head>
-   <%
-     int width = session.getAttribute("appletWidth") == null ? 190
-         : (Integer) session.getAttribute("appletWidth");
-     int height = session.getAttribute("appletHeight") == null ? 130
-         : (Integer) session.getAttribute("appletHeight");
-     String backgroundImg = StringEscapeUtils.escapeJavaScript(session
-         .getAttribute("appletBackground") == null ? "../img/chip32.png"
-         : (String) session.getAttribute("appletBackground"));
-     String backgroundColor = StringEscapeUtils
-         .escapeJavaScript((String) session
-             .getAttribute("appletBackgroundColor"));
-
-     String sessionId = StringEscapeUtils.escapeJavaScript(session.getId());
-
-     String dataURL = request.getRequestURL().toString();
-     dataURL = dataURL.substring(0, dataURL.lastIndexOf('/')) + "/DataURLServer";
-   %>
-   <body id="appletpage" style="width:<%=width%>px;height:<%=height%>px">
-     <div style="width:<%=width%>px;height:<%=height%>px">
-		     <form action="http://127.0.0.1:3495/http-security-layer-request" method="post" enctype="application/x-www-form-urlencoded">
-		       <input name="SessionID_" value="<%=sessionId%>" type="hidden"/>
-		       <input name="DataURL" value="<%=dataURL%>" id="DataURL" type="hidden"/>
-		       <input name="XMLRequest" value="<NullOperationRequest xmlns='http://www.buergerkarte.at/namespaces/securitylayer/1.2#'/>" type="hidden"/>
-		       <p>Anfrage wird an lokale BKU gesendet</p>
-           <div style="text-align: center;">
-		        <input type="submit" style="vertical-align: middle"/>
-           </div>
-		     </form>
-     </div>
-   </body>
+  <head>
+    <META HTTP-EQUIV="Content-Type" CONTENT="text/html; charset=UTF-8">
+    <META HTTP-EQUIV="CACHE-CONTROL" CONTENT="NO-CACHE">
+    <META HTTP-EQUIV="EXPIRES" CONTENT="Mon, 22 Jul 2002 11:12:01 GMT">
+    <META HTTP-EQUIV="PRAGMA" CONTENT="NO-CACHE">
+    <title><fmt:message key="title"/></title>
+    <link rel="shortcut icon" href="img/chip16.ico" type="image/x-icon">
+    <style type="text/css" media="all">
+      root {
+        display: block;
+      }
+      body {
+        background: #ffffff;
+        padding: 0;
+        margin: 0;
+        width: <c:out value="${requestScope.moccaParam.appletWidth}" default="${defaultWidth}"/>px;
+        height: <c:out value="${requestScope.moccaParam.appletHeight}" default="${defaultHeight}"/>px;
+      }
+      #container {
+        padding: 0;
+        margin: 0;
+        width: <c:out value="${requestScope.moccaParam.appletWidth}" default="${defaultWidth}"/>px;
+        background: <c:out value="${requestScope.moccaParam.appletBackgroundColor}" default="#eeeeee"/>;
+      }
+      #message {
+        margin: 0;
+        padding: 0.25em 0 0.25em 0;
+        clear: both;
+      }
+      #message p{
+        margin: 0;
+        padding: 0.25em 0.5em 0.25em 0.5em;
+      }
+    </style>
+  </head>
+  <body>
+    <div id="container">
+      <form action="http://localhost:3495/http-security-layer-request" method="post" enctype="application/x-www-form-urlencoded">
+        <input name="SessionID_" value="${requestScope.id}" type="hidden"/>
+        <input name="DataURL" value="${dataUrl}" id="DataURL" type="hidden"/>
+        <input name="XMLRequest" value="<NullOperationRequest xmlns='http://www.buergerkarte.at/namespaces/securitylayer/1.2#'/>" type="hidden"/>
+        <div id="message">
+          <p><fmt:message key="local"/></p>
+          <p style="text-align: right;">
+            <input type="submit" style="vertical-align: middle"/>
+          </p>
+        </div>
+      </form>
+    </div>
+  </body>
 </html>
+</fmt:bundle>