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 ce0e5d56c2b80d68a0ede1c2789310c131066954..826fa1b56d35fd10f4034754c18439610a7a9079 100644 (file)
--- a/src/org/cacert/gigi/output/CertificateTable.java
+++ b/src/org/cacert/gigi/output/CertificateTable.java
@@ -3,60 +3,59 @@ package org.cacert.gigi.output;
 import java.io.PrintWriter;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.util.LinkedList;
 import java.util.Map;
 
 import org.cacert.gigi.Language;
-import org.cacert.gigi.output.DataTable.Cell;
+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" };
+
        @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\">");
-                       final LinkedList<Cell> cells = new LinkedList<>();
+                       out.println("<form method=\"post\">");
+                       out.println("<table class=\"wrapper dataTable\">");
+                       out.println("<thead><tr>");
+                       for (String column : columnNames) {
+                               out.print("<td>");
+                               out.print(l.getTranslation(column));
+                               out.println("</td>");
+                       }
+                       out.print("<td colspan=\"2\">");
+                       out.print(l.getTranslation("Comment *"));
+                       out.println("</td></tr></thead><tbody>");
+
                        rs.beforeFirst();
                        while (rs.next()) {
                                // out.println(rs.getString("id"));
-                               cells.add(new Cell());
-                               cells.add(new Cell("State", false));
-                               cells.add(new Cell(rs.getString("CN"), false));
-                               cells.add(new Cell(rs.getString("serial"), false));
+                               out.print("<tr><td>&nbsp;</td><td>State</td><td>");
+                               out.println(rs.getString("CN"));
+                               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("</a></td><td>");
                                if (rs.getString("revoked") == null) {
-                                       cells.add(new Cell("N/A", false));
+                                       out.println("N/A");
                                } else {
-                                       cells.add(new Cell(rs.getString("revoked"), false));
+                                       out.println(rs.getString("revoked"));
                                }
-                               cells.add(new Cell(rs.getString("expire"), false));
-                               cells.add(new Cell(rs.getString("a"), false));
-                               cells.add(new Cell(rs.getString("a"), false));
+                               out.print("</td><td>");
+                               out.println(rs.getString("expire"));
+                               out.println("</td><td>a</td><td>a</td></tr>");
                        }
-                       DataTable t = new DataTable() {
-
-                               @Override
-                               protected LinkedList<Cell> getTableContent() {
-                                       return cells;
-                               }
-
-                               @Override
-                               protected Cell[] getColumns() {
-                                       return new Cell[] { new Cell("Renew/Revoke/Delete", true),
-                                                       new Cell("Status", true),
-                                                       new Cell("Email Address", true),
-                                                       new Cell("SerialNumber", true),
-                                                       new Cell("Revoked", true),
-                                                       new Cell("Expires", true), new Cell("Login", true),
-                                                       new Cell("Comment*", true, "colspan=\"2\"") };
-                               }
-                       };
-                       t.output(out, l, vars);
-                       out.println("</form>");
+                       out.println("</tbody></table>");
                } catch (SQLException e) {
                        e.printStackTrace();
                }