View Log button for GCA

3 files changed, 21 insertions, 0 deletions

diff --git a/build.xml b/build.xml
index 59d79b5a..080c91b6 100644
--- a/build.xml
+++ b/build.xml
@@ -767,6 +767,7 @@
 			<resource file="${basedir}/resources/settings_32x32.png" />

 			<resource file="${basedir}/resources/search-icon.png" />

 			<resource file="${basedir}/resources/mail_16x16.png" />

+			<resource file="${basedir}/resources/script_16x16.png" />

 			<resource file="${basedir}/resources/blank.png" />

 			<resource file="${basedir}/resources/bullet_green.png" />

 			<resource file="${basedir}/resources/bullet_orange.png" />

diff --git a/resources/script_16x16.png b/resources/script_16x16.png
new file mode 100644
index 00000000..ec93a22f
--- /dev/null
+++ b/resources/script_16x16.png
diff --git a/src/com/gitblit/authority/GitblitAuthority.java b/src/com/gitblit/authority/GitblitAuthority.java
index 5ee6af59..ed942e58 100644
--- a/src/com/gitblit/authority/GitblitAuthority.java
+++ b/src/com/gitblit/authority/GitblitAuthority.java
@@ -67,6 +67,7 @@ import javax.swing.JPasswordField;
 import javax.swing.JScrollPane;

 import javax.swing.JSplitPane;

 import javax.swing.JTable;

+import javax.swing.JTextArea;

 import javax.swing.JTextField;

 import javax.swing.RowFilter;

 import javax.swing.SwingConstants;

@@ -92,6 +93,7 @@ import com.gitblit.client.HeaderPanel;
 import com.gitblit.client.Translation;

 import com.gitblit.models.UserModel;

 import com.gitblit.utils.ArrayUtils;

+import com.gitblit.utils.FileUtils;

 import com.gitblit.utils.StringUtils;

 import com.gitblit.utils.TimeUtils;

 import com.gitblit.utils.X509Utils;

@@ -681,6 +683,23 @@ public class GitblitAuthority extends JFrame implements X509Log {
 			}

 		});

 		

+		JButton logButton = new JButton(new ImageIcon(getClass().getResource("/script_16x16.png")));

+		logButton.setFocusable(false);

+		logButton.setToolTipText(Translation.get("gb.log"));		

+		logButton.addActionListener(new ActionListener() {

+			@Override

+			public void actionPerformed(ActionEvent e) {

+				File log = new File(folder, X509Utils.CERTS + File.separator + "log.txt");

+				if (log.exists()) {

+					String content = FileUtils.readContent(log,  "\n");

+					JTextArea textarea = new JTextArea(content);

+					JScrollPane scrollPane = new JScrollPane(textarea);

+					scrollPane.setPreferredSize(new Dimension(700, 400));

+					JOptionPane.showMessageDialog(GitblitAuthority.this, scrollPane, log.getAbsolutePath(), JOptionPane.INFORMATION_MESSAGE);

+				}

+			}

+		});

+		

 		final JTextField filterTextfield = new JTextField(15);

 		filterTextfield.addActionListener(new ActionListener() {

 			public void actionPerformed(ActionEvent e) {

@@ -697,6 +716,7 @@ public class GitblitAuthority extends JFrame implements X509Log {
 		buttonControls.add(certificateDefaultsButton);

 		buttonControls.add(newSSLCertificate);

 		buttonControls.add(emailBundle);

+		buttonControls.add(logButton);

 

 		JPanel userControls = new JPanel(new FlowLayout(FlowLayout.RIGHT, Utils.MARGIN, Utils.MARGIN));

 		userControls.add(new JLabel(Translation.get("gb.filter")));