[Fedora-directory-commits] console/src/com/netscape/management/client/console LoginDialog.java, 1.2, 1.3 console.properties, 1.8, 1.9

[Nathan Kinder (nkinder)]

Author: nkinder

Update of /cvs/dirsec/console/src/com/netscape/management/client/console
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv20617/src/com/netscape/management/client/console

Modified Files:
	LoginDialog.java console.properties 
Log Message:
Resolves: 379211
Summary: Removed unused labels, corrected CRL file label, and added help dialog to LoginDialog class.



Index: LoginDialog.java
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/LoginDialog.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- LoginDialog.java	29 Jun 2007 20:32:28 -0000	1.2
+++ LoginDialog.java	15 Nov 2007 16:56:52 -0000	1.3
@@ -249,18 +249,14 @@
       * invoke help
       */
     protected void helpInvoked() {
-        String urlString = Console._resource.getString("login", "help");
-        if (urlString.length()>0) {
-          //one level up to the <sr> instead of <sr>/java
-          File f = new File("..");
-                    
-          try {
-            URL url = f.toURL();
-                    
-            Browser browser = new Browser();
-            browser.open(url.toString()+urlString,  Browser.EXISTING_WINDOW);
-          } catch (Exception urlError) {
-          }
+        /* Display a help dialog */
+        String helpMsg = Console._resource.getString("login", "help");
+        if (helpMsg.length()>0) {
+            JOptionPane.showMessageDialog(
+                    SplashScreen.getInstance(), helpMsg,
+                    Console._resource.getString("login","helptitle"),
+                    JOptionPane.INFORMATION_MESSAGE);
+            ModalDialogUtil.sleep();
         }
     }
 }


Index: console.properties
===================================================================
RCS file: /cvs/dirsec/console/src/com/netscape/management/client/console/console.properties,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- console.properties	2 Jul 2007 18:49:24 -0000	1.8
+++ console.properties	15 Nov 2007 16:56:52 -0000	1.9
@@ -22,7 +22,8 @@
 login-password=Password:
 login-url=Administration URL:
 login-copyright=Copyright (C) Red Hat, Inc.
-login-help=manual/en/console/help/login.htm
+login-help=Login to your Administration Server.\n\nYour admin user and Administration Server URL were configured at setup time.\n\nPlease refer to the setup log in your system tmp directory if you are unsure of\nthe Administration Server port or your admin user's userid.
+login-helptitle=Login Help
 login-passwordDialogTitle=Bind Password
 
 restart-title=Restart Directory Server