/hg/icedtea-web: Present more information in unsigned applet con...

[adomurad at icedtea.classpath.org]

changeset 234f159f8b4b in /hg/icedtea-web
details: http://icedtea.classpath.org/hg/icedtea-web?cmd=changeset;node=234f159f8b4b
author: Adam Domurad <adomurad at redhat.com>
date: Fri Apr 12 09:49:28 2013 -0400

	Present more information in unsigned applet confirmation.


diffstat:

 ChangeLog                                                               |  11 +++++++++
 netx/net/sourceforge/jnlp/resources/Messages.properties                 |   4 +-
 netx/net/sourceforge/jnlp/security/UnsignedAppletTrustWarningPanel.java |  12 +++++-----
 3 files changed, 19 insertions(+), 8 deletions(-)

diffs (90 lines):

diff -r a94822453711 -r 234f159f8b4b ChangeLog
--- a/ChangeLog	Fri Apr 12 15:32:24 2013 +0200
+++ b/ChangeLog	Fri Apr 12 09:49:28 2013 -0400
@@ -1,3 +1,14 @@
+2013-04-12  Adam Domurad  <adomurad at redhat.com>
+
+	Present more information in unsigned applet confirmation.
+	* netx/net/sourceforge/jnlp/resources/Messages.properties
+	(SRememberCodebase): Add codebase parameter.
+	(SUnsignedDetail): Change layout, add documentbase parameter.
+	* netx/net/sourceforge/jnlp/security/UnsignedAppletTrustWarningPanel.java
+	(setupInfoPanel): Pass documentbase to SUnsignedDetail.
+	(createCheckBoxPanel): Ensure left-alignment.
+	(createButtonPanel): Less spacing above button. 
+
 2013-04-12  Jiri Vanek <jvanek at redhat.com>
 
 	Added help for extended applets security and settings
diff -r a94822453711 -r 234f159f8b4b netx/net/sourceforge/jnlp/resources/Messages.properties
--- a/netx/net/sourceforge/jnlp/resources/Messages.properties	Fri Apr 12 15:32:24 2013 +0200
+++ b/netx/net/sourceforge/jnlp/resources/Messages.properties	Fri Apr 12 09:49:28 2013 -0400
@@ -225,9 +225,9 @@
 SHttpsUnverified=The website's HTTPS certificate cannot be verified.
 SRememberOption=<b>Remember this option?</b>
 SRememberAppletOnly=For applet
-SRememberCodebase=For site
+SRememberCodebase=For site <u>{0}</u>
 SUnsignedSummary=An unsigned Java application wants to run
-SUnsignedDetail=An unsigned application from the following location wants to run:<br><u>{0}</u><br><br><b>It is recommended you only run applications from sites you trust.</b> 
+SUnsignedDetail=An unsigned application from the following location wants to run:<br>&nbsp;&nbsp;<u>{0}</u><br>The page which made the request was:<br>&nbsp;&nbsp;<u>{1}</u><br><br><b>It is recommended you only run applications from sites you trust.</b> 
 SUnsignedAllowedBefore=<font color="green">You have accepted this applet previously.</font>
 SUnsignedRejectedBefore=<font color="red">You have rejected this applet previously.</font>
 SUnsignedQuestion=Allow the applet to run?
diff -r a94822453711 -r 234f159f8b4b netx/net/sourceforge/jnlp/security/UnsignedAppletTrustWarningPanel.java
--- a/netx/net/sourceforge/jnlp/security/UnsignedAppletTrustWarningPanel.java	Fri Apr 12 15:32:24 2013 +0200
+++ b/netx/net/sourceforge/jnlp/security/UnsignedAppletTrustWarningPanel.java	Fri Apr 12 09:49:28 2013 -0400
@@ -98,7 +98,7 @@
     private final int PANE_WIDTH = 500;
 
     private final int TOP_PANEL_HEIGHT = 60;
-    private final int INFO_PANEL_HEIGHT = 100;
+    private final int INFO_PANEL_HEIGHT = 140;
     private final int INFO_PANEL_HINT_HEIGHT = 25;
     private final int QUESTION_PANEL_HEIGHT = 35;
 
@@ -156,7 +156,7 @@
     }
 
     private void setupInfoPanel() {
-        String infoLabelText = R("SUnsignedDetail", file.getCodeBase());
+        String infoLabelText = R("SUnsignedDetail", file.getCodeBase(), file.getSourceLocation());
         ExecuteUnsignedApplet rememberedAction = UnsignedAppletTrustConfirmation.getStoredAction(file);
         int panelHeight = INFO_PANEL_HEIGHT;
         if (rememberedAction == ExecuteUnsignedApplet.YES) {
@@ -182,7 +182,7 @@
         questionPanel.add(new JLabel(htmlWrap(R("SUnsignedQuestion"))), BorderLayout.EAST);
 
         questionPanel.setPreferredSize(new Dimension(PANE_WIDTH, QUESTION_PANEL_HEIGHT));
-        questionPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
+        questionPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 0, 10));
 
         add(questionPanel);
     }
@@ -195,7 +195,7 @@
         applyToAppletButton.setSelected(true);
         applyToAppletButton.setEnabled(false); // Start disabled until 'Remember this option' is selected
 
-        applyToCodeBaseButton = new JRadioButton(R("SRememberCodebase"));
+        applyToCodeBaseButton = new JRadioButton(htmlWrap(R("SRememberCodebase", file.getCodeBase())));
         applyToCodeBaseButton.setEnabled(false);
 
         group.add(applyToAppletButton);
@@ -208,7 +208,7 @@
     }
 
     private JPanel createCheckBoxPanel() {
-        JPanel checkBoxPanel = new JPanel(new FlowLayout(FlowLayout.RIGHT));
+        JPanel checkBoxPanel = new JPanel(new FlowLayout(FlowLayout.LEFT));
 
         permanencyCheckBox = new JCheckBox(htmlWrap(R("SRememberOption")));
         permanencyCheckBox.addActionListener(permanencyListener());
@@ -240,7 +240,7 @@
         buttonPanel.add(rejectButton);
         buttonPanel.add(helpButton);
 
-        buttonPanel.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
+        buttonPanel.setBorder(BorderFactory.createEmptyBorder(0, 10, 10, 10));
 
         return buttonPanel;
     }