summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUI.java4
-rw-r--r--BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUIFacade.java2
-rw-r--r--BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties2
-rw-r--r--BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_de.properties2
-rw-r--r--BKUHelp/src/main/webapp/help/de/help.get.certificate.html55
-rw-r--r--BKUHelp/src/main/webapp/help/de/index.html1
-rw-r--r--BKUHelp/src/main/webapp/help/help.get.certificate.html53
-rw-r--r--BKUHelp/src/main/webapp/help/index.html1
-rw-r--r--BKUHelpWebStart/src/main/webappOverlay/help/index.html1
-rw-r--r--smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/GetHardwareInfoRequestHandler.java2
10 files changed, 119 insertions, 4 deletions
diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUI.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUI.java
index 513aa241..b6331b49 100644
--- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUI.java
+++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUI.java
@@ -76,7 +76,9 @@ public class GetCertificateGUI extends CardMgmtGUI implements
mainPanel.removeAll();
buttonPanel.removeAll();
-
+
+ helpListener.setHelpTopic(HELP_GETCERT);
+
titleLabel.setText(getMessage(TITLE_GETCERTIFICATE));
getSimCertButton = new JButton();
diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUIFacade.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUIFacade.java
index 2b1d6188..7a62de2a 100644
--- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUIFacade.java
+++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/GetCertificateGUIFacade.java
@@ -33,6 +33,8 @@ import java.io.File;
public interface GetCertificateGUIFacade extends BKUGUIFacade {
+ public static final String HELP_GETCERT = "help.get.certificate";
+
public static final String BUTTON_SIM_CERT = "button.simple.certificate";
public static final String BUTTON_QUAL_CERT = "button.qualified.certificate";
public static final String FILE_TYPE_NAME = "file.certificate";
diff --git a/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties b/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties
index 9d15c8a0..b51e2fdd 100644
--- a/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties
+++ b/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties
@@ -29,7 +29,7 @@ title.activate.success=<html>Success</html>
title.change.success=<html>Success</html>
title.unblock.success=<html>Success</html>
title.identity=<html>Identity Link</html>
-title.certificate.save=<html>Save certificate</html>
+title.certificate.save=Save certificate
title.get.certificate=<html>Save certificates</html>
title.hardwareinfo = <html>Hardware Information</html>
diff --git a/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_de.properties b/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_de.properties
index a2da3d33..7e03282c 100644
--- a/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_de.properties
+++ b/BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_de.properties
@@ -36,7 +36,7 @@ identity.button=<html>Abbrechen</html>
identity.firstname=<html>Vorname:</html>
identity.dateofbirth=<html>Geburtsdatum:</html>
identity.lastname=<html>Nachname:</html>
-title.certificate.save=<html>Zertifikat speichern</html>
+title.certificate.save=Zertifikat speichern
title.get.certificate=<html>Zertifikate speichern</html>
# removed message.* prefix to reuse keys as help keys
diff --git a/BKUHelp/src/main/webapp/help/de/help.get.certificate.html b/BKUHelp/src/main/webapp/help/de/help.get.certificate.html
new file mode 100644
index 00000000..fc6f27cf
--- /dev/null
+++ b/BKUHelp/src/main/webapp/help/de/help.get.certificate.html
@@ -0,0 +1,55 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>B&uuml;rgerkarte - Hilfe</title>
+<link href="../css/help.css" rel="stylesheet" type="text/css" />
+<link rel="shortcut icon" href="../img/chip16.ico" type="image/x-icon"/>
+<!--[if IE]>
+<style type="text/css">
+/* place css fixes for all versions of IE in this conditional comment */
+.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
+.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
+/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
+</style>
+<![endif]-->
+</head>
+
+<body class="twoColElsLtHdr">
+
+<div id="container">
+ <div id="header">
+ <h1>Online-Hilfe</h1>
+ <!-- end #header --></div>
+ <div id="sidebar1">
+ <p><img src="img/help.get.certificate.png" alt="Bildschirmfoto" width="190" height="130"/></p>
+ <p><strong>Hinweis:</strong> Das Bildschirmfoto oben kann von der Darstellung in der Webseite abweichen.</p>
+ <!-- end #sidebar1 --></div>
+ <div id="mainContent">
+ <h1>Zertifikate Speichern</h1>
+ <p>Mit Hilfe dieser Funktion können Sie die auf der Karte hinterlegten öffentlichen Zertifikate lokal auf Ihrem Gerät speichern,
+ wobei der unterst&uuml;tzte Funktionsumfang vom Typ und Zustand der verwendeten Karte abh&auml;ngt.
+ </p>
+ <p>Auf der Karte sind zwei Zertifikate hinterlegt. </p>
+ <ul>
+ <li>Einfaches Zertifikat</li>
+ <li>Qualifiziertes Zertifikat</li>
+ </ul>
+ <p>Der Speichervorgang wird durch die Betätigung der jeweiligen Schaltfläche ausgelöst.
+ </p>
+ <p style="text-align: center"><img src="img/help.get.certificate.png" alt="Bildschirmfoto" width="295" height="200" /></p>
+ <p>Wählen Sie im folgenden Fenster den Ordner in dem das Zertifikat gespeichert werden soll.
+ Anschließend betätigen Sie die Schaltfläche 'Speichern' um das Zertifikat zu speichern oder 'Abbrechen' um den Vorgang abzubrechen.
+ </p>
+ <p style="text-align: center"><img src="img/help.get.certificate.directory.png" alt="Bildschirmfoto" width="295" height="200" /></p>
+
+ <p><br class="clearfloat" /></p>
+ </div>
+ <div id="footer">
+ <p>
+ <a href="http://www.buergerkarte.at">&Ouml;sterreichische B&uuml;rgerkarte</a> | <a href="http://mocca.egovlabs.gv.at">B&uuml;rgerkartensoftware MOCCA</a>
+ </p>
+ </div>
+<!-- end #container --></div>
+</body>
+</html>
diff --git a/BKUHelp/src/main/webapp/help/de/index.html b/BKUHelp/src/main/webapp/help/de/index.html
index 51f93a45..1dee5635 100644
--- a/BKUHelp/src/main/webapp/help/de/index.html
+++ b/BKUHelp/src/main/webapp/help/de/index.html
@@ -33,6 +33,7 @@
<li><a href="help.hashdataviewer.html">Anzeige der Signaturdaten</a></li>
<li><a href="help.pin.mgmt.html">PIN Verwaltung</a></li>
<li><a href="help.change.pin.html">Ändern der PIN</a></li>
+ <li><a href="help.get.certificate.html">Zertifikat speichern</a></li>
</ul>
<p>Wenn Sie auf diesen Seiten keine Antwort auf ihre Fragen finden, gibt es unter
<a href="https://www.buergerkarte.at/mvnforum/mvnforum/index">www.buergerkarte.at</a> ein Support-Forum
diff --git a/BKUHelp/src/main/webapp/help/help.get.certificate.html b/BKUHelp/src/main/webapp/help/help.get.certificate.html
new file mode 100644
index 00000000..b5f5df72
--- /dev/null
+++ b/BKUHelp/src/main/webapp/help/help.get.certificate.html
@@ -0,0 +1,53 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+<title>CitizenCard - Help</title>
+<link href="css/help.css" rel="stylesheet" type="text/css" />
+<link rel="shortcut icon" href="img/chip16.ico" type="image/x-icon"/>
+<!--[if IE]>
+<style type="text/css">
+/* place css fixes for all versions of IE in this conditional comment */
+.twoColElsLtHdr #sidebar1 { padding-top: 30px; }
+.twoColElsLtHdr #mainContent { zoom: 1; padding-top: 15px; }
+/* the above proprietary zoom property gives IE the hasLayout it needs to avoid several bugs */
+</style>
+<![endif]-->
+</head>
+
+<body class="twoColElsLtHdr">
+
+<div id="container">
+ <div id="header">
+ <h1>Online Help</h1>
+ <!-- end #header --></div>
+ <div id="sidebar1">
+ <p><img src="img/help.get.certificate.png" alt="applet screenshot" width="190" height="130"/></p>
+ <p><strong>Note</strong> that the screenshot may differ slightly from the actual web page.</p>
+ <!-- end #sidebar1 --></div>
+ <div id="mainContent">
+ <h1>Save Certificate</h1>
+ <p>This feature can be used to store the public certificates, which are deposited on the identity card, on your local machine.
+ The functional range depends on the type and the status of the smartcard which is in use.</p>
+ <p>There are two certificates deposited on the identity card.</p>
+ <ul>
+ <li>Simple certificate</li>
+ <li>Qualified certificate</li>
+ </ul>
+ <p>The save-certificate operation is initiated by pressing the respective button.</p>
+ <p style="text-align: center"><img src="img/help.get.certificate.png" alt="screenshot" width="295" height="200" /></p>
+ <p>You can choose the folder where the certificate should be stored. Subsequent to the folder selection, the save-certificate operation can be finished
+ by pressing the 'Save' button or aborted by pressing the 'Cancel' button.
+ </p>
+ <p style="text-align: center"><img src="img/help.get.certificate.directory.png" alt="screenshot" width="295" height="200" /></p>
+
+ <p><br class="clearfloat" /></p>
+ </div>
+ <div id="footer">
+ <p>
+ <a href="http://www.buergerkarte.at">Austrian CitizenCard</a> | <a href="http://mocca.egovlabs.gv.at">CitizenCard Environment MOCCA</a>
+ </p>
+ </div>
+<!-- end #container --></div>
+</body>
+</html>
diff --git a/BKUHelp/src/main/webapp/help/index.html b/BKUHelp/src/main/webapp/help/index.html
index 52eb0588..8a5b269f 100644
--- a/BKUHelp/src/main/webapp/help/index.html
+++ b/BKUHelp/src/main/webapp/help/index.html
@@ -34,6 +34,7 @@
<li><a href="help.hashdataviewer.html">Signature data display</a></li>
<li><a href="help.pin.mgmt.html">PIN management</a></li>
<li><a href="help.change.pin.html">Change PIN</a></li>
+ <li><a href="help.get.certificate.html">Save certificate</a></li>
</ul>
<p>If you don't find answers to your questions in those pages, you can find a support Forum
for the citizen card at <a href="https://www.buergerkarte.at/mvnforum/mvnforum/index">www.buergerkarte.at</a>.</p>
diff --git a/BKUHelpWebStart/src/main/webappOverlay/help/index.html b/BKUHelpWebStart/src/main/webappOverlay/help/index.html
index 90bbede8..2788e817 100644
--- a/BKUHelpWebStart/src/main/webappOverlay/help/index.html
+++ b/BKUHelpWebStart/src/main/webappOverlay/help/index.html
@@ -35,6 +35,7 @@
<li><a href="help.hashdataviewer.html">Signature data display</a></li>
<li><a href="help.pin.mgmt.html">PIN management</a></li>
<li><a href="help.change.pin.html">Change PIN</a></li>
+ <li><a href="help.get.certificate.html">Zertifikat speichern</a></li>
<li><a href="help.config.html">Configuration file</a></li>
</ul>
<p>If you don't find answers to your questions in those pages, you can find a support Forum
diff --git a/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/GetHardwareInfoRequestHandler.java b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/GetHardwareInfoRequestHandler.java
index c3cb7df0..af0cdd44 100644
--- a/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/GetHardwareInfoRequestHandler.java
+++ b/smccSTALExt/src/main/java/at/gv/egiz/bku/smccstal/GetHardwareInfoRequestHandler.java
@@ -60,7 +60,7 @@ public class GetHardwareInfoRequestHandler extends AbstractRequestHandler {
String terminal = card.getTerminalName();
String smartcard = card.toString();
String smartcard_ATR = toString(card.getCard().getATR().getBytes());
-
+
gui.showHardwareInfoDialog(this, "back", terminal, smartcard, smartcard_ATR);
while (true) {