From c8b26c51aa67fc9345b624e36aab6f819e7eed74 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sun, 25 Nov 2012 11:35:31 -0500
Subject: [PATCH] Gitblit Certificate Authority revisions. Eliminate certificate scripts.
---
src/com/gitblit/authority/NewClientCertificateDialog.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/src/com/gitblit/authority/NewClientCertificateDialog.java b/src/com/gitblit/authority/NewClientCertificateDialog.java
index ad4fe9a..b04ae73 100644
--- a/src/com/gitblit/authority/NewClientCertificateDialog.java
+++ b/src/com/gitblit/authority/NewClientCertificateDialog.java
@@ -50,12 +50,12 @@
JCheckBox sendEmail;
boolean isCanceled = true;
- public NewClientCertificateDialog(Frame owner, String displayname, Date defaultExpiration) {
+ public NewClientCertificateDialog(Frame owner, String displayname, Date defaultExpiration, boolean allowEmail) {
super(owner);
setTitle(Translation.get("gb.newCertificate"));
- JPanel content = new JPanel(new BorderLayout(5, 5)) {
+ JPanel content = new JPanel(new BorderLayout(Utils.MARGIN, Utils.MARGIN)) {
private static final long serialVersionUID = 1L;
@Override
@@ -72,7 +72,7 @@
hint = new JTextField(20);
sendEmail = new JCheckBox(Translation.get("gb.sendEmail"));
- JPanel panel = new JPanel(new GridLayout(0, 2, 5, 5));
+ JPanel panel = new JPanel(new GridLayout(0, 2, Utils.MARGIN, Utils.MARGIN));
panel.add(new JLabel(Translation.get("gb.expires")));
panel.add(expirationDate);
@@ -86,8 +86,10 @@
panel.add(new JLabel(Translation.get("gb.passwordHint")));
panel.add(hint);
- panel.add(new JLabel(""));
- panel.add(sendEmail);
+ if (allowEmail) {
+ panel.add(new JLabel(""));
+ panel.add(sendEmail);
+ }
content.add(panel, BorderLayout.CENTER);
@@ -123,7 +125,7 @@
private boolean validateInputs() {
if (getExpiration().getTime() < System.currentTimeMillis()) {
// expires before now
- JOptionPane.showMessageDialog(this, Translation.get("gb.invalidExpiraitonDate"),
+ JOptionPane.showMessageDialog(this, Translation.get("gb.invalidExpirationDate"),
Translation.get("gb.error"), JOptionPane.ERROR_MESSAGE);
return false;
}
--
Gitblit v1.9.1