summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorclemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2009-08-21 16:02:45 +0000
committerclemenso <clemenso@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2009-08-21 16:02:45 +0000
commit8b2cc798b260b3034142cb1b13084ad1b7646ae6 (patch)
tree284dd82c4f46975c1385addae6f58dc35dea386f
parent723d2f2bfbb0a7f2e4c34cd9a22af471dbc2ba8f (diff)
downloadmocca-8b2cc798b260b3034142cb1b13084ad1b7646ae6.tar.gz
mocca-8b2cc798b260b3034142cb1b13084ad1b7646ae6.tar.bz2
mocca-8b2cc798b260b3034142cb1b13084ad1b7646ae6.zip
icons 2.0
git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@464 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
Diffstat
-rw-r--r--BKUOnline/pom.xml2
-rw-r--r--BKUOnline/src/main/webapp/PINManagement.jsp2
-rw-r--r--BKUOnline/src/main/webapp/SLRequestForm.html2
-rw-r--r--BKUOnline/src/main/webapp/applet.jsp4
-rw-r--r--BKUOnline/src/main/webapp/img/BackgroundChipperling.pngbin2041 -> 0 bytes
-rw-r--r--BKUOnline/src/main/webapp/img/BackgroundEcard.pngbin31706 -> 0 bytes
-rw-r--r--BKUOnline/src/main/webapp/img/BackgroundMocca.pngbin1287 -> 0 bytes
-rw-r--r--BKUOnline/src/main/webapp/img/ChipperlingCutoff.pngbin1522 -> 0 bytes
-rw-r--r--BKUOnline/src/main/webapp/img/chip16.icobin0 -> 1150 bytes
-rw-r--r--BKUOnline/src/main/webapp/img/chip32.pngbin0 -> 1753 bytes
-rw-r--r--BKUOnline/src/main/webapp/img/favicon.icobin2238 -> 0 bytes
-rw-r--r--BKUOnline/src/main/webapp/img/mocca-t_s.pngbin8976 -> 0 bytes
-rw-r--r--BKUOnline/src/main/webapp/index.html6
-rw-r--r--BKUOnline/src/main/webapp/js/deployJava.js2
14 files changed, 10 insertions, 8 deletions
diff --git a/BKUOnline/pom.xml b/BKUOnline/pom.xml
index 705a1300..b0a9d80e 100644
--- a/BKUOnline/pom.xml
+++ b/BKUOnline/pom.xml
@@ -39,7 +39,7 @@
<dependency>
<artifactId>BKUHelp</artifactId>
<groupId>at.gv.egiz</groupId>
- <version>1.0</version>
+ <version>1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
diff --git a/BKUOnline/src/main/webapp/PINManagement.jsp b/BKUOnline/src/main/webapp/PINManagement.jsp
index d62dc09b..454174e7 100644
--- a/BKUOnline/src/main/webapp/PINManagement.jsp
+++ b/BKUOnline/src/main/webapp/PINManagement.jsp
@@ -23,7 +23,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>MOCCA PIN Management</title>
- <link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
+ <link rel="shortcut icon" href="img/chip16.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>
diff --git a/BKUOnline/src/main/webapp/SLRequestForm.html b/BKUOnline/src/main/webapp/SLRequestForm.html
index b3aeb8e0..997a3c82 100644
--- a/BKUOnline/src/main/webapp/SLRequestForm.html
+++ b/BKUOnline/src/main/webapp/SLRequestForm.html
@@ -19,6 +19,7 @@
<head>
<title>Security-Layer v1.2 Request Formular</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+ <link rel="shortcut icon" href="img/chip16.ico" type="image/x-icon">
<script language="JavaScript">
<!--
function setAppletDimension(width, height)
@@ -151,6 +152,7 @@
<input type="radio" name="appletGuiStyle" value="simple" checked="checked" onclick="setAppletDimension(190,130)">simple
<input type="radio" name="appletGuiStyle" value="advanced" onclick="setAppletDimension(300, 180)">advanced
</p>
+
<p><label for="appletWidth">Applet Width</label> <input
name="appletWidth" value="190" id="appletWidth">
<p><label for="appletHeight">Applet Height</label> <input
diff --git a/BKUOnline/src/main/webapp/applet.jsp b/BKUOnline/src/main/webapp/applet.jsp
index 5564df2e..1e38cc04 100644
--- a/BKUOnline/src/main/webapp/applet.jsp
+++ b/BKUOnline/src/main/webapp/applet.jsp
@@ -23,7 +23,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>MOCCA Applet</title>
- <link rel="shortcut icon" href="img/favicon.ico" type="image/x-icon">
+ <link rel="shortcut icon" href="img/chip16.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>
@@ -37,7 +37,7 @@
int height = session.getAttribute("appletHeight") == null ? 130
: (Integer) session.getAttribute("appletHeight");
String backgroundImg = session.getAttribute("appletBackground") == null
- ? "../img/ChipperlingCutoff.png"
+ ? "../img/chip32.png"
: (String) session.getAttribute("appletBackground");
String guiStyle = (String) session.getAttribute("appletGuiStyle");
String locale = (String) session.getAttribute("locale");
diff --git a/BKUOnline/src/main/webapp/img/BackgroundChipperling.png b/BKUOnline/src/main/webapp/img/BackgroundChipperling.png
deleted file mode 100644
index 5097aa6b..00000000
--- a/BKUOnline/src/main/webapp/img/BackgroundChipperling.png
+++ /dev/null
Binary files differ
diff --git a/BKUOnline/src/main/webapp/img/BackgroundEcard.png b/BKUOnline/src/main/webapp/img/BackgroundEcard.png
deleted file mode 100644
index 11ba891e..00000000
--- a/BKUOnline/src/main/webapp/img/BackgroundEcard.png
+++ /dev/null
Binary files differ
diff --git a/BKUOnline/src/main/webapp/img/BackgroundMocca.png b/BKUOnline/src/main/webapp/img/BackgroundMocca.png
deleted file mode 100644
index 349d9ff0..00000000
--- a/BKUOnline/src/main/webapp/img/BackgroundMocca.png
+++ /dev/null
Binary files differ
diff --git a/BKUOnline/src/main/webapp/img/ChipperlingCutoff.png b/BKUOnline/src/main/webapp/img/ChipperlingCutoff.png
deleted file mode 100644
index 337b144b..00000000
--- a/BKUOnline/src/main/webapp/img/ChipperlingCutoff.png
+++ /dev/null
Binary files differ
diff --git a/BKUOnline/src/main/webapp/img/chip16.ico b/BKUOnline/src/main/webapp/img/chip16.ico
new file mode 100644
index 00000000..42175127
--- /dev/null
+++ b/BKUOnline/src/main/webapp/img/chip16.ico
Binary files differ
diff --git a/BKUOnline/src/main/webapp/img/chip32.png b/BKUOnline/src/main/webapp/img/chip32.png
new file mode 100644
index 00000000..e7efb020
--- /dev/null
+++ b/BKUOnline/src/main/webapp/img/chip32.png
Binary files differ
diff --git a/BKUOnline/src/main/webapp/img/favicon.ico b/BKUOnline/src/main/webapp/img/favicon.ico
deleted file mode 100644
index e2a24bb0..00000000
--- a/BKUOnline/src/main/webapp/img/favicon.ico
+++ /dev/null
Binary files differ
diff --git a/BKUOnline/src/main/webapp/img/mocca-t_s.png b/BKUOnline/src/main/webapp/img/mocca-t_s.png
deleted file mode 100644
index bbf27a66..00000000
--- a/BKUOnline/src/main/webapp/img/mocca-t_s.png
+++ /dev/null
Binary files differ
diff --git a/BKUOnline/src/main/webapp/index.html b/BKUOnline/src/main/webapp/index.html
index 95eb6992..8fa02a9a 100644
--- a/BKUOnline/src/main/webapp/index.html
+++ b/BKUOnline/src/main/webapp/index.html
@@ -19,8 +19,9 @@
<head>
<title>MOCCA</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+ <link rel="shortcut icon" href="img/chip16.ico" type="image/x-icon">
<style type="text/css" media="all">@import "css/main.css";</style>
- <script src="js/deployJava.js"></script>
+ <script src="js/deployJava.js" type="text/javascript"></script>
</head>
<body>
<div id="animDiv" class="box">
@@ -40,7 +41,7 @@
<!-- MOCCA Web Start
| (activate 'include-webstart' profile)
-
+ -->
<div id="animDiv" class="box">
<p>
<h1>MOCCA Web Start</h1>
@@ -53,6 +54,5 @@
<p><a href="webstart/player.jnlp">Java Cache Viewer</a> (local installation)</p>
</p>
</div>
- -->
</body>
</html>
diff --git a/BKUOnline/src/main/webapp/js/deployJava.js b/BKUOnline/src/main/webapp/js/deployJava.js
index 225ca80f..ab75c961 100644
--- a/BKUOnline/src/main/webapp/js/deployJava.js
+++ b/BKUOnline/src/main/webapp/js/deployJava.js
@@ -34,7 +34,7 @@
* This file contains workarounds to
* [#423] Firefox 3.0.11 bug #498132 causes applet loading failure
* (lines 95-99)
- * [#424] Web Start loading via java plugin (Sun deployment script) fails on WinXP
+ * [#424] Web Start loading via java plugin (Sun deployment script) fails on WinXP/Vista
* (lines 501-506)
*
* features:
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-21 22:52:18 +0000