Build out certificate issuing.

[gigi.git] / src / org / cacert / gigi / output / CertificateTable.java

diff --git a/src/org/cacert/gigi/output/CertificateTable.java b/src/org/cacert/gigi/output/CertificateTable.java
index 413de877b9235bb0988f33fe0ee99b1dfe076cbe..826fa1b56d35fd10f4034754c18439610a7a9079 100644 (file)
--- a/src/org/cacert/gigi/output/CertificateTable.java
+++ b/src/org/cacert/gigi/output/CertificateTable.java
@@ -6,50 +6,56 @@ import java.sql.SQLException;
 import java.util.Map;
 
 import org.cacert.gigi.Language;
+import org.cacert.gigi.pages.account.MailCertificates;
 
 public class CertificateTable implements Outputable {
        String resultSet;
+
        public CertificateTable(String resultSet) {
                this.resultSet = resultSet;
        }
-       private static final String[] columnNames = new String[]{
-                       "Renew/Revoke/Delete", "Status", "Email Address", "SerialNumber",
-                       "Revoked", "Expires", "Login"};
+
+       private static final String[] columnNames = new String[] { "Renew/Revoke/Delete", "Status", "Email Address",
+                       "SerialNumber", "Revoked", "Expires", "Login" };
 
        @Override
        public void output(PrintWriter out, Language l, Map<String, Object> vars) {
                ResultSet rs = (ResultSet) vars.get(resultSet);
                try {
-                       out.println("<form method=\"post\" action=\"account.php\">");
-                       out.println("<table align=\"center\" valign=\"middle\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"wrapper\">");
-                       out.println("<tr>");
+                       out.println("<form method=\"post\">");
+                       out.println("<table class=\"wrapper dataTable\">");
+                       out.println("<thead><tr>");
                        for (String column : columnNames) {
-                               out.print("<td class=\"DataTD\">");
+                               out.print("<td>");
                                out.print(l.getTranslation(column));
                                out.println("</td>");
                        }
-                       out.print("<td colspan=\"2\" class=\"DataTD\">");
+                       out.print("<td colspan=\"2\">");
                        out.print(l.getTranslation("Comment *"));
-                       out.println("</td></tr>");
+                       out.println("</td></tr></thead><tbody>");
 
                        rs.beforeFirst();
                        while (rs.next()) {
                                // out.println(rs.getString("id"));
-                               out.print("<tr><td class=\"DataTD\">&nbsp;</td><td class=\"DataTD\">State</td><td class=\"DataTD\">");
+                               out.print("<tr><td>&nbsp;</td><td>State</td><td>");
                                out.println(rs.getString("CN"));
-                               out.print("</td><td class=\"DataTD\">");
+                               out.print("</td><td><a href='");
+                               out.print(MailCertificates.PATH);
+                               out.print("/");
+                               out.print(rs.getString("serial"));
+                               out.print("'>");
                                out.println(rs.getString("serial"));
-                               out.print("</td><td class=\"DataTD\">");
+                               out.print("</a></td><td>");
                                if (rs.getString("revoked") == null) {
                                        out.println("N/A");
                                } else {
                                        out.println(rs.getString("revoked"));
                                }
-                               out.print("</td><td class=\"DataTD\">");
+                               out.print("</td><td>");
                                out.println(rs.getString("expire"));
-                               out.println("</td><td class=\"DataTD\">a</td><td class=\"DataTD\">a</td></tr>");
+                               out.println("</td><td>a</td><td>a</td></tr>");
                        }
-                       out.println("</table>");
+                       out.println("</tbody></table>");
                } catch (SQLException e) {
                        e.printStackTrace();
                }