Bugzilla Bug 700462 - No action on clicking Help button of pkiconsole's right pane

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1994 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

40 files changed, 80 insertions, 40 deletions

diff --git a/pki/base/console/src/com/netscape/admin/certsrv/CMSPassword.java b/pki/base/console/src/com/netscape/admin/certsrv/CMSPassword.java
index 97b748f17..4fbca9011 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/CMSPassword.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/CMSPassword.java
@@ -260,7 +260,8 @@ public class CMSPassword extends JDialog
         mHelp = CMSAdminUtil.makeJButton(mResource, PREFIX, "HELP",
           null, this);
         
-        JButton[] buttons = { mOK, mCancel, mHelp};
+        //JButton[] buttons = { mOK, mCancel, mHelp};
+        JButton[] buttons = { mOK, mCancel};
         JButtonFactory.resize( buttons );
         return CMSAdminUtil.makeJButtonPanel(buttons, true);
     }
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ACIDialog.java b/pki/base/console/src/com/netscape/admin/certsrv/config/ACIDialog.java
index 1951dc6ab..7c2948795 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ACIDialog.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/ACIDialog.java
@@ -319,7 +319,8 @@ public class ACIDialog extends JDialog
         mOK = CMSAdminUtil.makeJButton(mResource, PREFIX, "OK", null, this);
         mCancel = CMSAdminUtil.makeJButton(mResource, PREFIX, "CANCEL", null, this);
         mHelp = CMSAdminUtil.makeJButton(mResource, PREFIX, "HELP", null, this);
-        JButton[] buttons = { mOK, mCancel, mHelp};
+        //JButton[] buttons = { mOK, mCancel, mHelp};
+        JButton[] buttons = { mOK, mCancel};
         JButtonFactory.resize( buttons );
         return CMSAdminUtil.makeJButtonPanel( buttons, true);
     }
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ACLEditDialog.java b/pki/base/console/src/com/netscape/admin/certsrv/config/ACLEditDialog.java
index ef5521038..9aa392eaf 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ACLEditDialog.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/ACLEditDialog.java
@@ -329,7 +329,8 @@ public class ACLEditDialog extends JDialog
         mOK = CMSAdminUtil.makeJButton(mResource, PREFIX, "OK", null, this);
         mCancel = CMSAdminUtil.makeJButton(mResource, PREFIX, "CANCEL", null, this);
         mHelp = CMSAdminUtil.makeJButton(mResource, PREFIX, "HELP", null, this);
-        JButton[] buttons = { mOK, mCancel, mHelp};
+        //JButton[] buttons = { mOK, mCancel, mHelp};
+        JButton[] buttons = { mOK, mCancel};
         JButtonFactory.resize( buttons );
         return CMSAdminUtil.makeJButtonPanel( buttons, true);
     }
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ACLImplTab.java b/pki/base/console/src/com/netscape/admin/certsrv/config/ACLImplTab.java
index 18869b195..b0dd8bb9e 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ACLImplTab.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/ACLImplTab.java
@@ -117,7 +117,8 @@ public class ACLImplTab extends CMSBaseUGTab {
     protected JPanel createActionPanel() {
         mRefresh = makeJButton("REFRESH");
         mHelp = makeJButton("HELP");
-        JButton[] buttons = { mRefresh, mHelp };
+        //JButton[] buttons = { mRefresh, mHelp };
+        JButton[] buttons = { mRefresh };
         return makeJButtonPanel(buttons, true);
     }
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ACLPanel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/ACLPanel.java
index 4f627222e..3b3d8c529 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ACLPanel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/ACLPanel.java
@@ -131,7 +131,8 @@ public class ACLPanel extends CMSBaseUGTab {
     protected JPanel createActionPanel() {
         mRefresh = makeJButton("REFRESH");
         mHelp = makeJButton("HELP");
-        JButton[] buttons = { mRefresh, mHelp };
+        //JButton[] buttons = { mRefresh, mHelp };
+        JButton[] buttons = { mRefresh };
         return makeJButtonPanel(buttons, true);
     }
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CACertsTab.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CACertsTab.java
index 6d918fd29..e57c56271 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CACertsTab.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CACertsTab.java
@@ -229,7 +229,8 @@ public class CACertsTab extends CMSBaseUGTab {
         //actionlister to this object
         mRefresh = makeJButton("REFRESH");
         mHelp = makeJButton("HELP");
-        JButton[] buttons = { mRefresh, mHelp };
+        //JButton[] buttons = { mRefresh, mHelp };
+        JButton[] buttons = { mRefresh };
         return makeJButtonPanel(buttons, true);
     }
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigDialog.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigDialog.java
index 2d3129f8e..20116c54c 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigDialog.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSBaseConfigDialog.java
@@ -580,7 +580,8 @@ public class CMSBaseConfigDialog extends JDialog
         mCancel = CMSAdminUtil.makeJButton(mResource, PREFIX, "CANCEL", null, this);
         mHelp = CMSAdminUtil.makeJButton(mResource, PREFIX, "HELP", null, this);
 
-		JButton[] buttons = { mOK, mCancel, mHelp};
+	//JButton[] buttons = { mOK, mCancel, mHelp};
+	JButton[] buttons = { mOK, mCancel};
 		JButtonFactory.resize( buttons );
         return CMSAdminUtil.makeJButtonPanel( buttons, true);
     }
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSKRAAutoPanel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSKRAAutoPanel.java
index ba126c9db..be81b035b 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSKRAAutoPanel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSKRAAutoPanel.java
@@ -135,7 +135,8 @@ public class CMSKRAAutoPanel extends CMSBaseUGTab {
         //actionlister to this object
         mRefresh = makeJButton("REFRESH");
         mHelp = makeJButton("HELP");
-        JButton[] buttons = { mRefresh, mHelp };
+        //JButton[] buttons = { mRefresh, mHelp };
+        JButton[] buttons = { mRefresh };
         return makeJButtonPanel(buttons, true);
     }
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSKRAPasswdPanel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSKRAPasswdPanel.java
index dbdba0d4c..7c52eab87 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSKRAPasswdPanel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSKRAPasswdPanel.java
@@ -113,7 +113,8 @@ public class CMSKRAPasswdPanel extends CMSBaseUGTab {
         //actionlister to this object
         mRefresh = makeJButton("REFRESH");
         mHelp = makeJButton("HELP");
-        JButton[] buttons = { mRefresh, mHelp };
+        //JButton[] buttons = { mRefresh, mHelp };
+        JButton[] buttons = { mRefresh };
         return makeJButtonPanel(buttons, true);
     }
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSKRASchemePanel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSKRASchemePanel.java
index 8e743d92e..274b7d54e 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSKRASchemePanel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSKRASchemePanel.java
@@ -115,7 +115,8 @@ public class CMSKRASchemePanel extends CMSBaseUGTab {
         //actionlister to this object
         mRefresh = makeJButton("REFRESH");
         mHelp = makeJButton("HELP");
-        JButton[] buttons = { mRefresh, mHelp };
+        //JButton[] buttons = { mRefresh, mHelp };
+        JButton[] buttons = { mRefresh };
         return makeJButtonPanel(buttons, true);
     }
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSPluginInstanceTab.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSPluginInstanceTab.java
index 7f775a4c0..3e50148f3 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSPluginInstanceTab.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSPluginInstanceTab.java
@@ -227,7 +227,8 @@ public abstract class CMSPluginInstanceTab extends CMSBaseUGTab {
         //actionlister to this object
         mRefresh = makeJButton("REFRESH");
         mHelp = makeJButton("HELP");
-		JButton[] buttons = { mRefresh, mHelp };
+	//JButton[] buttons = { mRefresh, mHelp };
+	JButton[] buttons = { mRefresh };
 		return makeJButtonPanel( buttons , true);
     }
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSTabPanel.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSTabPanel.java
index 60650807f..63899892f 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CMSTabPanel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CMSTabPanel.java
@@ -311,7 +311,8 @@ public class CMSTabPanel extends CMSBaseConfigPanel
 		mbReset = makeJButton("RESET");
 		mbHelp = makeJButton("HELP");
 
-		JButton[] buttons = { mbOK, mbReset, mbHelp };
+		//JButton[] buttons = { mbOK, mbReset, mbHelp };
+		JButton[] buttons = { mbOK, mbReset };
 		return makeJButtonPanel(buttons, true, true);
     }
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/CRLIPEditor.java b/pki/base/console/src/com/netscape/admin/certsrv/config/CRLIPEditor.java
index 8f442d4ff..ea7d78c4f 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/CRLIPEditor.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/CRLIPEditor.java
@@ -267,7 +267,8 @@ public class CRLIPEditor extends JDialog implements ActionListener {
         mOK = CMSAdminUtil.makeJButton(mResource, PREFIX, "OK", null, this);
         mCancel = CMSAdminUtil.makeJButton(mResource, PREFIX, "CANCEL", null, this);
         mHelp = CMSAdminUtil.makeJButton(mResource, PREFIX, "HELP", null, this);
-        JButton[] buttons = { mOK, mCancel, mHelp};
+        //JButton[] buttons = { mOK, mCancel, mHelp};
+        JButton[] buttons = { mOK, mCancel};
         JButtonFactory.resize( buttons );
         return CMSAdminUtil.makeJButtonPanel( buttons, true);
     }
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ConnectorEditor.java b/pki/base/console/src/com/netscape/admin/certsrv/config/ConnectorEditor.java
index 4c1ee89e5..b6b831d05 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ConnectorEditor.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/ConnectorEditor.java
@@ -551,7 +551,8 @@ public class ConnectorEditor extends JDialog implements ActionListener, MouseLis
         mOK = CMSAdminUtil.makeJButton(mResource, PREFIX, "OK", null, this);
         mCancel = CMSAdminUtil.makeJButton(mResource, PREFIX, "CANCEL", null, this);
         mHelp = CMSAdminUtil.makeJButton(mResource, PREFIX, "HELP", null, this);
-        JButton[] buttons = { mOK, mCancel, mHelp};
+        //JButton[] buttons = { mOK, mCancel, mHelp};
+        JButton[] buttons = { mOK, mCancel};
         JButtonFactory.resize( buttons );
         return CMSAdminUtil.makeJButtonPanel( buttons, true);
     }
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/JobsImplTab.java b/pki/base/console/src/com/netscape/admin/certsrv/config/JobsImplTab.java
index 13b02600a..58628b133 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/JobsImplTab.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/JobsImplTab.java
@@ -161,7 +161,8 @@ public class JobsImplTab extends CMSBaseUGTab {
         //actionlister to this object
         mRefresh = makeJButton("REFRESH");
         mHelp = makeJButton("HELP");
-        JButton[] buttons = { mRefresh, mHelp };
+        //JButton[] buttons = { mRefresh, mHelp };
+        JButton[] buttons = { mRefresh };
         return makeJButtonPanel(buttons, true);
     }
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/LogImplTab.java b/pki/base/console/src/com/netscape/admin/certsrv/config/LogImplTab.java
index 3f56b1d4d..984e2cb21 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/LogImplTab.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/LogImplTab.java
@@ -161,7 +161,8 @@ public class LogImplTab extends CMSBaseUGTab {
         //actionlister to this object
         mRefresh = makeJButton("REFRESH");
         mHelp = makeJButton("HELP");
-        JButton[] buttons = { mRefresh, mHelp };
+        //JButton[] buttons = { mRefresh, mHelp };
+        JButton[] buttons = { mRefresh };
         return makeJButtonPanel(buttons, true);
     }
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/MapperImplTab.java b/pki/base/console/src/com/netscape/admin/certsrv/config/MapperImplTab.java
index 9dcc4ffba..66d4ba4ce 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/MapperImplTab.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/MapperImplTab.java
@@ -166,7 +166,8 @@ public class MapperImplTab extends CMSBaseUGTab {
         //actionlister to this object
         mRefresh = makeJButton("REFRESH");
         mHelp = makeJButton("HELP");
-        JButton[] buttons = { mRefresh, mHelp };
+        // JButton[] buttons = { mRefresh, mHelp };
+        JButton[] buttons = { mRefresh };
         return makeJButtonPanel(buttons, true);
     }
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PanelMapperConfigDialog.java b/pki/base/console/src/com/netscape/admin/certsrv/config/PanelMapperConfigDialog.java
index f72d3361f..f3db6374a 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/PanelMapperConfigDialog.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/PanelMapperConfigDialog.java
@@ -280,7 +280,8 @@ public class PanelMapperConfigDialog extends JDialog
         mOK = CMSAdminUtil.makeJButton(mResource, PREFIX, "OK", null, this);
         mCancel = CMSAdminUtil.makeJButton(mResource, PREFIX, "CANCEL", null, this);
         mHelp = CMSAdminUtil.makeJButton(mResource, PREFIX, "HELP", null, this);
-        JButton[] buttons = { mOK, mCancel, mHelp};
+        //JButton[] buttons = { mOK, mCancel, mHelp};
+        JButton[] buttons = { mOK, mCancel};
         JButtonFactory.resize( buttons );
         return CMSAdminUtil.makeJButtonPanel( buttons, true);
     }
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PluginSelectionDialog.java b/pki/base/console/src/com/netscape/admin/certsrv/config/PluginSelectionDialog.java
index 2f0f2b09e..c88251f0b 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/PluginSelectionDialog.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/PluginSelectionDialog.java
@@ -253,7 +253,8 @@ public class PluginSelectionDialog extends JDialog
         mOK = CMSAdminUtil.makeJButton(mResource, mPrefix, "OK", null, this);
         mCancel = CMSAdminUtil.makeJButton(mResource, mPrefix, "CANCEL", null, this);
         mHelp = CMSAdminUtil.makeJButton(mResource, mPrefix, "HELP", null, this);
-        JButton[] buttons = { mOK, mCancel, mHelp};
+        //JButton[] buttons = { mOK, mCancel, mHelp};
+        JButton[] buttons = { mOK, mCancel};
         JButtonFactory.resize( buttons );
         return CMSAdminUtil.makeJButtonPanel( buttons, true);
     }
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyImplTab.java b/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyImplTab.java
index 2d988bfca..8e89dcf45 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyImplTab.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyImplTab.java
@@ -168,7 +168,8 @@ public class PolicyImplTab extends CMSBaseUGTab {
         //actionlister to this object
         mRefresh = makeJButton("REFRESH");
         mHelp = makeJButton("HELP");
-        JButton[] buttons = { mRefresh, mHelp };
+        //JButton[] buttons = { mRefresh, mHelp };
+        JButton[] buttons = { mRefresh };
         return makeJButtonPanel(buttons, true);
     }
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleOrderDialog.java b/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleOrderDialog.java
index 934cc21e0..ec7394d4e 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleOrderDialog.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/PolicyRuleOrderDialog.java
@@ -221,7 +221,8 @@ public class PolicyRuleOrderDialog extends JDialog
         mOK = CMSAdminUtil.makeJButton(mResource, PREFIX, "OK", null, this);
         mCancel = CMSAdminUtil.makeJButton(mResource, PREFIX, "CANCEL", null, this);
         mHelp = CMSAdminUtil.makeJButton(mResource, PREFIX, "HELP", null, this);
-		JButton[] buttons = { mOK, mCancel, mHelp};
+	//JButton[] buttons = { mOK, mCancel, mHelp};
+	JButton[] buttons = { mOK, mCancel};
 		JButtonFactory.resize( buttons );
         return CMSAdminUtil.makeJButtonPanel( buttons, true);
     }
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileImplTab.java b/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileImplTab.java
index fcb03ac28..e9047701c 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileImplTab.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileImplTab.java
@@ -162,7 +162,8 @@ public class ProfileImplTab extends CMSBaseUGTab {
         //actionlister to this object
         mRefresh = makeJButton("REFRESH");
         mHelp = makeJButton("HELP");
-        JButton[] buttons = { mRefresh, mHelp };
+        //JButton[] buttons = { mRefresh, mHelp };
+        JButton[] buttons = { mRefresh };
         return makeJButtonPanel(buttons, true);
     }
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicySelDialog.java b/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicySelDialog.java
index c1c90502b..4487754f2 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicySelDialog.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/ProfileNonPolicySelDialog.java
@@ -258,7 +258,8 @@ public class ProfileNonPolicySelDialog extends JDialog
         mOK = CMSAdminUtil.makeJButton(mResource, mPrefix, "OK", null, this);
         mCancel = CMSAdminUtil.makeJButton(mResource, mPrefix, "CANCEL", null, this);
         mHelp = CMSAdminUtil.makeJButton(mResource, mPrefix, "HELP", null, this);
-        JButton[] buttons = { mOK, mCancel, mHelp};
+        //JButton[] buttons = { mOK, mCancel, mHelp};
+        JButton[] buttons = { mOK, mCancel};
         JButtonFactory.resize( buttons );
         return CMSAdminUtil.makeJButtonPanel( buttons, true);
     }
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicySelectionDialog.java b/pki/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicySelectionDialog.java
index 44a6f3eca..69d502355 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicySelectionDialog.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/ProfilePolicySelectionDialog.java
@@ -311,7 +311,8 @@ public class ProfilePolicySelectionDialog extends JDialog
         mOK = CMSAdminUtil.makeJButton(mResource, mPrefix, "OK", null, this);
         mCancel = CMSAdminUtil.makeJButton(mResource, mPrefix, "CANCEL", null, this);
         mHelp = CMSAdminUtil.makeJButton(mResource, mPrefix, "HELP", null, this);
-        JButton[] buttons = { mOK, mCancel, mHelp};
+        //JButton[] buttons = { mOK, mCancel, mHelp};
+        JButton[] buttons = { mOK, mCancel};
         JButtonFactory.resize( buttons );
         return CMSAdminUtil.makeJButtonPanel( buttons, true);
     }
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/PublisherImplTab.java b/pki/base/console/src/com/netscape/admin/certsrv/config/PublisherImplTab.java
index 706f9ee49..ebe4db5db 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/PublisherImplTab.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/PublisherImplTab.java
@@ -166,7 +166,8 @@ public class PublisherImplTab extends CMSBaseUGTab {
         //actionlister to this object
         mRefresh = makeJButton("REFRESH");
         mHelp = makeJButton("HELP");
-        JButton[] buttons = { mRefresh, mHelp };
+        //JButton[] buttons = { mRefresh, mHelp };
+        JButton[] buttons = { mRefresh };
         return makeJButtonPanel(buttons, true);
     }
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/RuleImplTab.java b/pki/base/console/src/com/netscape/admin/certsrv/config/RuleImplTab.java
index d1424ff8f..b0c262dea 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/RuleImplTab.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/RuleImplTab.java
@@ -166,7 +166,8 @@ public class RuleImplTab extends CMSBaseUGTab {
         //actionlister to this object
         mRefresh = makeJButton("REFRESH");
         mHelp = makeJButton("HELP");
-        JButton[] buttons = { mRefresh, mHelp };
+        //JButton[] buttons = { mRefresh, mHelp };
+        JButton[] buttons = { mRefresh };
         return makeJButtonPanel(buttons, true);
     }
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/TKSKeysTab.java b/pki/base/console/src/com/netscape/admin/certsrv/config/TKSKeysTab.java
index 912cfa8b2..458885e2a 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/TKSKeysTab.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/TKSKeysTab.java
@@ -163,7 +163,8 @@ public class TKSKeysTab extends CMSBaseUGTab {
         //actionlister to this object
         mRefresh = makeJButton("REFRESH");
         mHelp = makeJButton("HELP");
-        JButton[] buttons = { mRefresh, mHelp };
+        //JButton[] buttons = { mRefresh, mHelp };
+        JButton[] buttons = { mRefresh };
         return makeJButtonPanel(buttons, true);
     }
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/config/UserCertsTab.java b/pki/base/console/src/com/netscape/admin/certsrv/config/UserCertsTab.java
index 136f4a446..4de04abdf 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/config/UserCertsTab.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/config/UserCertsTab.java
@@ -185,7 +185,8 @@ public class UserCertsTab extends CMSBaseUGTab {
         //actionlister to this object
         mRefresh = makeJButton("REFRESH");
         mHelp = makeJButton("HELP");
-        JButton[] buttons = { mRefresh, mHelp };
+        //JButton[] buttons = { mRefresh, mHelp };
+        JButton[] buttons = { mRefresh };
         return makeJButtonPanel(buttons, true);
     }
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/managecert/CertificateInfoDialog.java b/pki/base/console/src/com/netscape/admin/certsrv/managecert/CertificateInfoDialog.java
index fb3c78bbd..5e66a6357 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/managecert/CertificateInfoDialog.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/managecert/CertificateInfoDialog.java
@@ -212,7 +212,8 @@ public class CertificateInfoDialog extends JDialog
             d.width = CMSAdminUtil.DEFAULT_BUTTON_SIZE;
             mHelp.setMinimumSize(d);
         }
-        JButton[] buttons = {mClose, mHelp};
+        //JButton[] buttons = {mClose, mHelp};
+        JButton[] buttons = {mClose};
         return CMSAdminUtil.makeJButtonPanel( buttons );
     }
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/managecert/ManageCertDialog.java b/pki/base/console/src/com/netscape/admin/certsrv/managecert/ManageCertDialog.java
index dc848f376..20fad62ac 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/managecert/ManageCertDialog.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/managecert/ManageCertDialog.java
@@ -175,7 +175,8 @@ public class ManageCertDialog extends JDialog implements ActionListener,
           "MANAGECERTDIALOG_BUTTON_HELP_LABEL"));
         mHelp.addActionListener(this);
 
-        JButton[] buttons = {mClose, mEdit, mDelete, mHelp};
+        //JButton[] buttons = {mClose, mEdit, mDelete, mHelp};
+        JButton[] buttons = {mClose, mEdit, mDelete};
         return CMSAdminUtil.makeJButtonPanel(buttons, true);
     }
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/status/CMSLogPanel.java b/pki/base/console/src/com/netscape/admin/certsrv/status/CMSLogPanel.java
index bd19a467f..5329b1148 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/status/CMSLogPanel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/status/CMSLogPanel.java
@@ -217,7 +217,8 @@ public abstract class CMSLogPanel extends CMSBasePanel
         mView = makeJButton("VIEW");
         mRefresh = makeJButton("REFRESH");
         mHelp = makeJButton("HELP");
-		JButton[] buttons = { mView,mRefresh,mHelp };
+	//JButton[] buttons = { mView,mRefresh,mHelp };
+	JButton[] buttons = { mView,mRefresh };
 		return makeJButtonPanel(buttons,true,true);
     }
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/status/StatusPanel.java b/pki/base/console/src/com/netscape/admin/certsrv/status/StatusPanel.java
index 394a567cd..237224415 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/status/StatusPanel.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/status/StatusPanel.java
@@ -133,7 +133,8 @@ public class StatusPanel extends CMSBasePanel
         //actionlister to this object
         mRefresh = makeJButton("REFRESH");
         mHelp = makeJButton("HELP");
-		JButton[] buttons = { mRefresh,mHelp };
+	//JButton[] buttons = { mRefresh,mHelp };
+	JButton[] buttons = { mRefresh };
 		return makeJButtonPanel(buttons,true,true);
     }
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthBaseDialog.java b/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthBaseDialog.java
index d5822cbac..d2a412d18 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthBaseDialog.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthBaseDialog.java
@@ -234,7 +234,8 @@ public class AuthBaseDialog extends JDialog
             mOK.setEnabled(true);
         mCancel = CMSAdminUtil.makeJButton(mResource, mPrefix, "CANCEL", null, this);
         mHelp = CMSAdminUtil.makeJButton(mResource, mPrefix, "HELP", null, this);
-        JButton[] buttons = { mOK, mCancel, mHelp};
+        // JButton[] buttons = { mOK, mCancel, mHelp};
+        JButton[] buttons = { mOK, mCancel};
         JButtonFactory.resize( buttons );
         return CMSAdminUtil.makeJButtonPanel( buttons, true);
     }
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthImplTab.java b/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthImplTab.java
index 1bbfebf5c..52ec30824 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthImplTab.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/ug/AuthImplTab.java
@@ -151,7 +151,8 @@ public class AuthImplTab extends CMSBaseUGTab {
         //actionlister to this object
         mRefresh = makeJButton("REFRESH");
         mHelp = makeJButton("HELP");
-        JButton[] buttons = { mRefresh, mHelp };
+        //JButton[] buttons = { mRefresh, mHelp };
+        JButton[] buttons = { mRefresh };
         return makeJButtonPanel(buttons, true);
     }
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/CertManagementDialog.java b/pki/base/console/src/com/netscape/admin/certsrv/ug/CertManagementDialog.java
index d42727d8d..c6a1a878c 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/ug/CertManagementDialog.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/ug/CertManagementDialog.java
@@ -209,7 +209,8 @@ public class CertManagementDialog extends JDialog
         mOK = CMSAdminUtil.makeJButton(mResource, PREFIX, "OK", null, this);
         mCancel = CMSAdminUtil.makeJButton(mResource, PREFIX, "CANCEL", null, this);
         mHelp = CMSAdminUtil.makeJButton(mResource, PREFIX, "HELP", null, this);
-		JButton[] buttons = { mOK, mHelp};
+	// JButton[] buttons = { mOK, mHelp};
+	JButton[] buttons = { mOK};
 		JButtonFactory.resize( buttons );
         return CMSAdminUtil.makeJButtonPanel( buttons, true);
     }
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/GroupEditor.java b/pki/base/console/src/com/netscape/admin/certsrv/ug/GroupEditor.java
index d357a2828..f25267be5 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/ug/GroupEditor.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/ug/GroupEditor.java
@@ -316,7 +316,8 @@ public class GroupEditor extends JDialog
         mOK = CMSAdminUtil.makeJButton(mResource, PREFIX, "OK", null, this);
         mCancel = CMSAdminUtil.makeJButton(mResource, PREFIX, "CANCEL", null, this);
         mHelp = CMSAdminUtil.makeJButton(mResource, PREFIX, "HELP", null, this);
-		JButton[] buttons = { mOK, mCancel, mHelp };
+	//JButton[] buttons = { mOK, mCancel, mHelp };
+	JButton[] buttons = { mOK, mCancel };
         return CMSAdminUtil.makeJButtonPanel( buttons, true);
     }
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/GroupTab.java b/pki/base/console/src/com/netscape/admin/certsrv/ug/GroupTab.java
index 5b2e77d70..eca04bddc 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/ug/GroupTab.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/ug/GroupTab.java
@@ -208,7 +208,8 @@ public class GroupTab extends CMSBaseUGTab {
         //actionlister to this object
         mRefresh = makeJButton("REFRESH");
         mHelp = makeJButton("HELP");
-		JButton[] buttons = { mRefresh, mHelp };
+	// JButton[] buttons = { mRefresh, mHelp };
+	JButton[] buttons = { mRefresh };
 		return makeJButtonPanel( buttons, true);
     }
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/UserEditor.java b/pki/base/console/src/com/netscape/admin/certsrv/ug/UserEditor.java
index 820414b77..561b8bb19 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/ug/UserEditor.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/ug/UserEditor.java
@@ -386,7 +386,8 @@ public class UserEditor extends JDialog
         mOK = CMSAdminUtil.makeJButton(mResource, PREFIX, "OK", null, this);
         mCancel = CMSAdminUtil.makeJButton(mResource, PREFIX, "CANCEL", null, this);
         mHelp = CMSAdminUtil.makeJButton(mResource, PREFIX, "HELP", null, this);
-        JButton[] buttons = { mOK, mCancel, mHelp };
+        //JButton[] buttons = { mOK, mCancel, mHelp };
+        JButton[] buttons = { mOK, mCancel };
         return CMSAdminUtil.makeJButtonPanel( buttons, true);
     }
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/ug/UserTab.java b/pki/base/console/src/com/netscape/admin/certsrv/ug/UserTab.java
index f4b9de409..ccf7ac5ae 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/ug/UserTab.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/ug/UserTab.java
@@ -181,7 +181,8 @@ public class UserTab extends CMSBaseUGTab {
         //actionlister to this object
         mRefresh = makeJButton("REFRESH");
         mHelp = makeJButton("HELP");
-		JButton[] buttons = { mRefresh, mHelp };
+	//JButton[] buttons = { mRefresh, mHelp };
+	JButton[] buttons = { mRefresh };
 		return makeJButtonPanel( buttons, true);
     }
 
diff --git a/pki/base/console/src/com/netscape/admin/certsrv/wizard/WizardWidget.java b/pki/base/console/src/com/netscape/admin/certsrv/wizard/WizardWidget.java
index 92bed2895..c98d37b51 100644
--- a/pki/base/console/src/com/netscape/admin/certsrv/wizard/WizardWidget.java
+++ b/pki/base/console/src/com/netscape/admin/certsrv/wizard/WizardWidget.java
@@ -294,7 +294,8 @@ public class WizardWidget extends JDialog implements ActionListener
         mBHelp.setText(mResource.getString(CMSAdminResources.GENERAL_HELP));
         mBHelp.addActionListener(this);
 
-		JButton[] buttons = {mBBack, mBNext_Done, mBCancel, mBHelp };
+	//JButton[] buttons = {mBBack, mBNext_Done, mBCancel, mBHelp };
+	JButton[] buttons = {mBBack, mBNext_Done, mBCancel};
 		
 		//pass the buttons reference to wizardinfo
 		mInfo.setButtons(mBNext_Done, mBCancel, mBBack);