summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortkellner <tkellner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2012-04-02 16:39:13 +0000
committertkellner <tkellner@8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4>2012-04-02 16:39:13 +0000
commit3a529faca025926babd560d9b02270d926c7979c (patch)
tree99d8a72d4857e8e54e74ab512122fac311d31005
parent439b09ddcddd9162fa4eb1e6c64e28e7fe650b7c (diff)
downloadmocca-3a529faca025926babd560d9b02270d926c7979c.tar.gz
mocca-3a529faca025926babd560d9b02270d926c7979c.tar.bz2
mocca-3a529faca025926babd560d9b02270d926c7979c.zip
Integrating help url in tray icon version for identity link extension
and fixing identity link gui layout git-svn-id: https://joinup.ec.europa.eu/svn/mocca/trunk@1052 8a26b1a7-26f0-462f-b9ef-d0e30c41f5a4
-rw-r--r--BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/IdentityLinkGUI.java11
-rw-r--r--BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/IdentityLinkGUIFacade.java2
-rw-r--r--BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties6
-rw-r--r--BKUGuiExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_de.properties6
-rw-r--r--BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/IdentityLinkServlet.java2
5 files changed, 16 insertions, 11 deletions
diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/IdentityLinkGUI.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/IdentityLinkGUI.java
index 378395eb..62fb4f02 100644
--- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/IdentityLinkGUI.java
+++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/IdentityLinkGUI.java
@@ -88,6 +88,8 @@ public class IdentityLinkGUI extends CardMgmtGUI implements
public void run() {
log.debug("Show Identity Link dialog.");
+ helpListener.setHelpTopic(HELP_IDENTITYLINK);
+
mainPanel.removeAll();
buttonPanel.removeAll();
@@ -201,22 +203,23 @@ public class IdentityLinkGUI extends CardMgmtGUI implements
.addGroup(mainPanelLayout.createParallelGroup(Alignment.LEADING)
.addComponent(firstNameLabel)
.addComponent(lastNameLabel)
- .addComponent(birthdateLabel)))))
+ .addComponent(birthdateLabel))
+ .addContainerGap(50, Integer.MAX_VALUE))))
);
mainPanelLayout.setVerticalGroup(
mainPanelLayout.createParallelGroup(Alignment.LEADING)
.addGroup(mainPanelLayout.createSequentialGroup()
//.addContainerGap()
.addGroup(messageVertical)
- .addPreferredGap(ComponentPlacement.UNRELATED)
+ .addPreferredGap(ComponentPlacement.RELATED)
.addGroup(mainPanelLayout.createParallelGroup(Alignment.BASELINE)
.addComponent(firstNameLabel_description)
.addComponent(firstNameLabel))
- //.addPreferredGap(ComponentPlacement.UNRELATED)
+ .addPreferredGap(ComponentPlacement.RELATED)
.addGroup(mainPanelLayout.createParallelGroup(Alignment.BASELINE)
.addComponent(lastNameLabel_description)
.addComponent(lastNameLabel))
- //.addPreferredGap(ComponentPlacement.UNRELATED)
+ .addPreferredGap(ComponentPlacement.RELATED)
.addGroup(mainPanelLayout.createParallelGroup(Alignment.BASELINE)
.addComponent(birthdateLabel_description)
.addComponent(birthdateLabel)))
diff --git a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/IdentityLinkGUIFacade.java b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/IdentityLinkGUIFacade.java
index 2b96dc6e..784b623a 100644
--- a/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/IdentityLinkGUIFacade.java
+++ b/BKUGuiExt/src/main/java/at/gv/egiz/bku/gui/IdentityLinkGUIFacade.java
@@ -32,6 +32,8 @@ import java.awt.event.ActionListener;
*/
public interface IdentityLinkGUIFacade extends BKUGUIFacade {
+ public static final String HELP_IDENTITYLINK = "help.identity.link";
+
public static final String FIRSTNAME = "identity.firstname";
public static final String DATEOFBIRTH = "identity.dateofbirth";
public static final String LASTNAME = "identity.lastname";
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 58406afa..9d15c8a0 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
@@ -35,9 +35,9 @@ title.hardwareinfo = <html>Hardware Information</html>
identity.msg=<html>The identity link</html>
identity.button=<html>Cancel</html>
-identity.firstname=<html>First name</html>
-identity.dateofbirth=<html>Date of birth</html>
-identity.lastname=<html>Last name</html>
+identity.firstname=<html>First name:</html>
+identity.dateofbirth=<html>Date of birth:</html>
+identity.lastname=<html>Last name:</html>
# removed message.* prefix to reuse keys as help keys
pin.mgmt=<html>{0} PINs available</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 1e85dde8..a2da3d33 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
@@ -33,9 +33,9 @@ title.hardwareinfo=<html>Informationen zur Hardware</html>
identity.msg=<html>Informationen zur Personenbindung</html>
identity.button=<html>Abbrechen</html>
-identity.firstname=<html>Vorname</html>
-identity.dateofbirth=<html>Geburtsdatum</html>
-identity.lastname=<html>Nachname</html>
+identity.firstname=<html>Vorname:</html>
+identity.dateofbirth=<html>Geburtsdatum:</html>
+identity.lastname=<html>Nachname:</html>
title.certificate.save=<html>Zertifikat speichern</html>
title.get.certificate=<html>Zertifikate speichern</html>
diff --git a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/IdentityLinkServlet.java b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/IdentityLinkServlet.java
index 197f868b..02d6ac15 100644
--- a/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/IdentityLinkServlet.java
+++ b/BKULocal/src/main/java/at/gv/egiz/bku/local/webapp/IdentityLinkServlet.java
@@ -63,7 +63,7 @@ public class IdentityLinkServlet extends HttpServlet {
public IdentityLinkServlet() {
stalFactory = new LocalIdentityLinkSTALFactory();
try {
- stalFactory.setHelpURL("http://localhost:3495/help/");
+ stalFactory.setHelpURL("http://localhost:3495/help/help.identity.link.html");
} catch (MalformedURLException e) {
log.info("Failed to set help URL.", e);
}