summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorclemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2009-01-20 14:52:40 +0000
committerclemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2009-01-20 14:52:40 +0000
commit351eba07a9ba4e98e182c6210839c209dcbb82a6 (patch)
treefbabcd86367663632769a647faf36265c346184b
parent9676c9eb710bf10ecb4812043fedacd2f6e6278c (diff)
downloadmocca-351eba07a9ba4e98e182c6210839c209dcbb82a6.tar.gz
mocca-351eba07a9ba4e98e182c6210839c209dcbb82a6.tar.bz2
mocca-351eba07a9ba4e98e182c6210839c209dcbb82a6.zip
cleanup (removed hashdatadisplay config; rename HTTP-ohne.html, appletPage.jsp)
git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@270 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
Diffstat
-rw-r--r--BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/BKURequestHandler.java1
-rw-r--r--BKUOnline/src/main/webapp/WEB-INF/web.xml2
-rw-r--r--BKUOnline/src/main/webapp/css/login.css (renamed from BKUOnline/src/main/webapp/css/applet.css)0
-rw-r--r--BKUOnline/src/main/webapp/helpfiles/de/help.hashdataviewer.html1
-rw-r--r--BKUOnline/src/main/webapp/ieView.html31
-rw-r--r--BKUOnline/src/main/webapp/index.html2
-rw-r--r--BKUOnline/src/main/webapp/login.jsp (renamed from BKUOnline/src/main/webapp/appletPage.jsp)5
-rw-r--r--BKUOnline/src/main/webapp/multiHashDataInput.html37
-rw-r--r--BKUOnline/src/main/webapp/slRequestForm.html (renamed from BKUOnline/src/main/webapp/HTTP-ohne.html)6
9 files changed, 4 insertions, 81 deletions
diff --git a/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/BKURequestHandler.java b/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/BKURequestHandler.java
index 7930c53a..d9be0981 100644
--- a/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/BKURequestHandler.java
+++ b/BKUOnline/src/main/java/at/gv/egiz/bku/online/webapp/BKURequestHandler.java
@@ -49,7 +49,6 @@ public class BKURequestHandler extends SpringBKUServlet {
private static final long serialVersionUID = 1L;
- public final static String REDIRECT_URL = "appletPage.jsp";
public final static String REDIRECT_URL_SESSION_ATTRIBUTE="redirectUrl";
protected Log log = LogFactory.getLog(BKURequestHandler.class);
diff --git a/BKUOnline/src/main/webapp/WEB-INF/web.xml b/BKUOnline/src/main/webapp/WEB-INF/web.xml
index a9cdce13..e7a4e058 100644
--- a/BKUOnline/src/main/webapp/WEB-INF/web.xml
+++ b/BKUOnline/src/main/webapp/WEB-INF/web.xml
@@ -50,7 +50,7 @@
</servlet>
<servlet>
<servlet-name>BKUApplet</servlet-name>
- <jsp-file>/appletPage.jsp</jsp-file>
+ <jsp-file>/login.jsp</jsp-file>
</servlet>
<servlet>
<servlet-name>help</servlet-name>
diff --git a/BKUOnline/src/main/webapp/css/applet.css b/BKUOnline/src/main/webapp/css/login.css
index 4bfbd77d..4bfbd77d 100644
--- a/BKUOnline/src/main/webapp/css/applet.css
+++ b/BKUOnline/src/main/webapp/css/login.css
diff --git a/BKUOnline/src/main/webapp/helpfiles/de/help.hashdataviewer.html b/BKUOnline/src/main/webapp/helpfiles/de/help.hashdataviewer.html
index f7cf15df..eb1a35d6 100644
--- a/BKUOnline/src/main/webapp/helpfiles/de/help.hashdataviewer.html
+++ b/BKUOnline/src/main/webapp/helpfiles/de/help.hashdataviewer.html
@@ -28,6 +28,7 @@
<h1> Anzeige der Signaturdaten </h1>
<p>Dieses Fenster zeigt die zu signierenden Daten an. Dies k&ouml;nnen entweder reine Textdaten oder XHTML sein. Im Falle von XHML erhalten Sie den Hinweis, dass es sich bei den dargestellten Daten nur um eine Voransicht handelt. Um die Daten standardkonform darzustellen, m&uuml;ssen diese abgespeichert und mit einem geeigneten XHTML Betrachter ge&ouml;ffnen werden.</p>
<p>In jedem Fall k&ouml;nnen die zu signierenden abgespeichert werden.</p>
+ <p><br class="clearfloat" /></p>
</div>
<div id="footer">
<p>
diff --git a/BKUOnline/src/main/webapp/ieView.html b/BKUOnline/src/main/webapp/ieView.html
deleted file mode 100644
index 71f76eec..00000000
--- a/BKUOnline/src/main/webapp/ieView.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!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>Anzeige</title>
-<style type="text/css">
-body {
- font-size: 15px;
- font-weight: 500;
- font-family: Helvetica, Arial, sans-serif;
- background-color: DarkOrange;
- padding:1em 2em 0em 2em;
-}
-
-h1 {
- font-size: 20px;
-}
-</style>
-</head>
-<body>
-<h1>Achtung: Ihr Browser unterstützt dieses Anzeigeformat (XHTML) nicht.</h1> Die unten
-dargestellten Daten können von den tatsächlichen Signaturdaten abweichen.
-<a href="hashDataInput?ieCType=application%2Fxhtml%2Bxml">Hier</a>
-können Sie die Signaturdaten herunterladen.
-<br>
-<div style="height:700px; margin: 2em 0em 1em 0em">
-<iframe src="hashDataInput?ieCType=text/html" width="100%" height="100%" marginwidth="0"
-marginheight="0" frameborder="1" scrolling="auto">Ihr Browser unterstütz leider keine Iframes</iframe>
-</div>
-</body>
-</html> \ No newline at end of file
diff --git a/BKUOnline/src/main/webapp/index.html b/BKUOnline/src/main/webapp/index.html
index 8f1a338e..94e2890f 100644
--- a/BKUOnline/src/main/webapp/index.html
+++ b/BKUOnline/src/main/webapp/index.html
@@ -48,7 +48,7 @@
<div id="animDiv" class="box">
<p>
<h1>TestRequest</h1>
-<a href="HTTP-ohne.html">Security Layer Request</a>
+<a href="slRequestForm.html">Security Layer Request</a>
<h1>STAL Service</h1>
<a href="stal">STAL Service Endpoint Information</a>
</p>
diff --git a/BKUOnline/src/main/webapp/appletPage.jsp b/BKUOnline/src/main/webapp/login.jsp
index 8a21e4ec..44d9347c 100644
--- a/BKUOnline/src/main/webapp/appletPage.jsp
+++ b/BKUOnline/src/main/webapp/login.jsp
@@ -24,7 +24,7 @@
<title>MOCCA Applet</title>
<link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
<script type="text/javascript" src="js/deployJava.js"></script>
- <style type="text/css" media="all">@import "css/applet.css";</style>
+ <style type="text/css" media="all">@import "css/login.css";</style>
<META HTTP-EQUIV="CACHE-CONTROL" CONTENT="NO-CACHE">
<META HTTP-EQUIV="EXPIRES" CONTENT="Mon, 22 Jul 2002 11:12:01 GMT">
@@ -37,7 +37,6 @@
: (Integer) session.getAttribute("appletHeight");
String backgroundImg = (String) session.getAttribute("appletBackground");
String guiStyle = (String) session.getAttribute("appletGuiStyle");
- String hashDataDisplay = (String) session.getAttribute("appletHashDataDisplay");
String locale = (String) session.getAttribute("locale");
%>
<body id="appletpage" style="width:<%=width%>">
@@ -59,8 +58,6 @@
Background : '<%=backgroundImg%>',
WSDL_URL :'../stal;jsessionid=<%=session.getId()%>?wsdl',
HelpURL : '../help/',
- HashDataDisplay : '<%=hashDataDisplay%>',
- HashDataURL : '../hashDataInput',
SessionID : '<%=session.getId()%>',
RedirectURL : '../bkuResult',
RedirectTarget: '_parent'
diff --git a/BKUOnline/src/main/webapp/multiHashDataInput.html b/BKUOnline/src/main/webapp/multiHashDataInput.html
deleted file mode 100644
index bb03f8ce..00000000
--- a/BKUOnline/src/main/webapp/multiHashDataInput.html
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
- Copyright 2008 Federal Chancellery Austria and
- Graz University of Technology
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>Mehrere Signaturedaten</title>
-<style type="text/css">
-h1 {
- color: red;
- font-size: 15px;
- font-weight: 500;
- font-family: Helvetica, Arial, sans-serif;
-}
-</style>
-</head>
-<body>
-<div style="width:300px; padding:20px; border:5px solid #ff0000;text-align: center">
-<h1>Diese Signatur enthält mehrere Datenobjekte. <br>
-Die Anzeige dieser wird derzeit nicht unterstützt !</h1>
-</div>
-</body>
-</html> \ No newline at end of file
diff --git a/BKUOnline/src/main/webapp/HTTP-ohne.html b/BKUOnline/src/main/webapp/slRequestForm.html
index e5a35cf0..95eb1947 100644
--- a/BKUOnline/src/main/webapp/HTTP-ohne.html
+++ b/BKUOnline/src/main/webapp/slRequestForm.html
@@ -98,12 +98,6 @@ legend {
<input type="radio" name="appletGuiStyle" value="simple" checked="checked">simple
<input type="radio" name="appletGuiStyle" value="advanced">advanced
</p>
-<p>
- <label for="appletHashDataDisplay">HashData Display</label>
- <input type="radio" name="appletHashDataDisplay" value="frame" checked="checked">Frame
- <input type="radio" name="appletHashDataDisplay" value="browser">Browser
- <!--input type="radio" name="appletHashDataDisplay" value="internal">Applet-->
-</p>
<!--
<p><label for="RedirectURL">RedirectURL</label> <input
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 05:56:58 +0000