diff options
5 files changed, 11 insertions, 8 deletions
diff --git a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java index 848cd17f..e8415dc3 100644 --- a/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java +++ b/BKUAppletExt/src/main/java/at/gv/egiz/bku/gui/PINManagementGUIFacade.java @@ -28,6 +28,7 @@ import java.util.Map; public interface PINManagementGUIFacade extends BKUGUIFacade { public static final String HELP_PINMGMT = "help.pin.mgmt"; +// public static final String HELP_VERIFY_PIN = "help.pin.verify"; public static final String TITLE_PINMGMT = "title.pin.mgmt"; public static final String TITLE_ACTIVATE_PIN = "title.activate.pin"; public static final String TITLE_CHANGE_PIN = "title.change.pin"; diff --git a/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties b/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties index 15fc2827..bdf077d4 100644 --- a/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties +++ b/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages.properties @@ -27,7 +27,7 @@ pin.mgmt=<html>Die Karte verf\u00FCgt \u00FCber {0} PINs</html> activate.pin=<html>{0} eingeben und best\u00E4tigen</html> change.pin=<html>{0} eingeben und best\u00E4tigen</html> unblock.pin=<html>PUK zu {0} eingeben</html> -verify.pin=<html>{0} eingeben (TODO: Warning not activated)</html> +verify.pin=<html>{0} eingeben</html> verify.pinpad=<html>{0} ({1} stellig) am Kartenleser eingeben (und best\u00E4tigen).</html> activate.pinpad=<html>{0} ({1} stellig) am Kartenleser eingeben und wiederholen (jeweils best\u00E4tigen).</html> change.pinpad=<html>Alte {0} ({1} stellig) am Kartenleser eingeben, danach neue {0} eingeben und wiederholen (jeweils best\u00E4tigen). </html> diff --git a/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties b/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties index 8cc9d01a..037ae091 100644 --- a/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties +++ b/BKUAppletExt/src/main/resources/at/gv/egiz/bku/gui/ActivationMessages_en.properties @@ -16,6 +16,7 @@ title.activation=<html>Activation</html> title.pin.mgmt=<html>PIN Management</html> title.activate.pin=<html>Activate PIN</html> +title.verify.pin=<html>Enter PIN</html> title.change.pin=<html>Change PIN</html> title.unblock.pin=<html>Unblock PIN</html> title.activate.success=<html>Success</html> @@ -26,6 +27,7 @@ pin.mgmt=<html>The smartcard has {0} PINs</html> activate.pin=<html>Enter and confirm {0}</html> change.pin=<html>Enter and confirm {0}</html> unblock.pin=<html>Enter PUK for {0}</html> +verify.pin=<html>Enter {0}</html> verify.pinpad=<html>Enter {0} ({1} digits) on cardreader (and confirm).</html> activate.pinpad=<html>Enter {0} ({1} digits) on cardreader and repeat (confirm in each case).</html> change.pinpad=<html>Enter old {0} ({1} digits) on cardreader, then enter new {0} and repeat (confirm in each case).</html> diff --git a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java index a7eebbfd..e5cac7b7 100644 --- a/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java +++ b/BKUCommonGUI/src/main/java/at/gv/egiz/bku/gui/BKUGUIImpl.java @@ -1533,6 +1533,12 @@ public class BKUGUIImpl implements BKUGUIFacade { if (b.getPreferredSize().width > bs) { bs = b.getPreferredSize().width; } + // need cancel button for message dialog, + // even if renderCancelButton == false + b.setText(getMessage(BUTTON_CANCEL)); + if (b.getPreferredSize().width > bs) { + bs = b.getPreferredSize().width; + } b.setText(getMessage(BUTTON_SIGN)); if (b.getPreferredSize().width > bs) { bs = b.getPreferredSize().width; @@ -1545,12 +1551,6 @@ public class BKUGUIImpl implements BKUGUIFacade { if (b.getPreferredSize().width > bs) { bs = b.getPreferredSize().width; } - if (renderCancelButton) { - b.setText(getMessage(BUTTON_CANCEL)); - if (b.getPreferredSize().width > bs) { - bs = b.getPreferredSize().width; - } - } return bs; } } diff --git a/BKUOnline/src/main/webapp/applet.jsp b/BKUOnline/src/main/webapp/applet.jsp index b2e54673..51f23bbc 100644 --- a/BKUOnline/src/main/webapp/applet.jsp +++ b/BKUOnline/src/main/webapp/applet.jsp @@ -61,7 +61,7 @@ <script> if (!deployJava.versionCheck('1.6.0_04+')) { document - .write('<b>Diese Anwendung benötigt die Java Platform Version 1.6.0_04 oder höher.</b>' + '<input type="submit" value="Java Platform 1.6.0_02 installieren" onclick="deployJava.installLatestJRE();">'); + .write('<p>Diese Anwendung benötigt Version 6 Update 4 oder höher der <a href="" onclick="deployJava.installLatestJRE();">Java™ Laufzeitumgebung</a>.</p>'); } else { // to enable applet caching, remove AppletDispatcher servlet, // change codebase to 'applet', |