Rename email and domain table to plural.

[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 a3aa4b63993f4bdaf99b5925460a1aa5fba88ca5..d64fb2578bceb34c03c5f53fda07b65a58a1d48a 100644 (file)
--- a/src/org/cacert/gigi/output/CertificateTable.java
+++ b/src/org/cacert/gigi/output/CertificateTable.java
@@ -3,65 +3,64 @@ 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.Certificates;
 
 public class CertificateTable implements Outputable {
-       String resultSet;
-       public CertificateTable(String resultSet) {
-               this.resultSet = resultSet;
-       }
 
-       @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<>();
-                       cells.add(new Cell("Renew/Revoke/Delete", true));
-                       cells.add(new Cell("Status", true));
-                       cells.add(new Cell("Email Address", true));
-                       cells.add(new Cell("SerialNumber", true));
-                       cells.add(new Cell("Revoked", true));
-                       cells.add(new Cell("Expires", true));
-                       cells.add(new Cell("Login", true));
-                       cells.add(new Cell("Comment *", true, "colspan=\"2\""));
-                       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));
-                               if (rs.getString("revoked") == null) {
-                                       cells.add(new Cell("N/A", false));
-                               } else {
-                                       cells.add(new Cell(rs.getString("revoked"), false));
-                               }
-                               cells.add(new Cell(rs.getString("expire"), false));
-                               cells.add(new Cell(rs.getString("a"), false));
-                               cells.add(new Cell(rs.getString("a"), false));
-                       }
-                       DataTable t = new DataTable() {
+    String resultSet;
 
-                               @Override
-                               protected LinkedList<Cell> getTableContent() {
-                                       return cells;
-                               }
+    public CertificateTable(String resultSet) {
+        this.resultSet = resultSet;
+    }
 
-                               @Override
-                               protected int getColoumnCount() {
-                                       return 8;
-                               }
-                       };
-                       t.output(out, l, vars);
-                       out.println("</form>");
-               } catch (SQLException e) {
-                       e.printStackTrace();
-               }
+    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\">");
+            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"));
+                out.print("<tr><td>&nbsp;</td><td>State</td><td>");
+                out.println(rs.getString("CN"));
+                out.print("</td><td><a href='");
+                out.print(Certificates.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) {
+                    out.println("N/A");
+                } else {
+                    out.println(rs.getString("revoked"));
+                }
+                out.print("</td><td>");
+                out.println(rs.getString("expire"));
+                out.println("</td><td>a</td><td>a</td></tr>");
+            }
+            out.println("</tbody></table>");
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+
+    }
 }