X-Git-Url: https://code.wpia.club/?a=blobdiff_plain;f=src%2Forg%2Fcacert%2Fgigi%2Foutput%2FCertificateTable.java;h=413de877b9235bb0988f33fe0ee99b1dfe076cbe;hb=2931145000af1e49fd175cd17297a87ede22742f;hp=a5c43d853cc708d2942c0a5c71f4dd22357c6715;hpb=7ff9efc4b22e9f32a78ed70409064ec887d2fb4d;p=gigi.git

diff --git a/src/org/cacert/gigi/output/CertificateTable.java b/src/org/cacert/gigi/output/CertificateTable.java
index a5c43d85..413de877 100644
--- a/src/org/cacert/gigi/output/CertificateTable.java
+++ b/src/org/cacert/gigi/output/CertificateTable.java
@@ -3,57 +3,53 @@ 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.output.DataTable.EmptyCell;
 
 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("<table align=\"center\" valign=\"middle\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\" class=\"wrapper\">");
+			out.println("<tr>");
+			for (String column : columnNames) {
+				out.print("<td class=\"DataTD\">");
+				out.print(l.getTranslation(column));
+				out.println("</td>");
+			}
+			out.print("<td colspan=\"2\" class=\"DataTD\">");
+			out.print(l.getTranslation("Comment *"));
+			out.println("</td></tr>");
+
 			rs.beforeFirst();
 			while (rs.next()) {
 				// out.println(rs.getString("id"));
-				cells.add(new EmptyCell());
-				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 class=\"DataTD\">&nbsp;</td><td class=\"DataTD\">State</td><td class=\"DataTD\">");
+				out.println(rs.getString("CN"));
+				out.print("</td><td class=\"DataTD\">");
+				out.println(rs.getString("serial"));
+				out.print("</td><td class=\"DataTD\">");
 				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 class=\"DataTD\">");
+				out.println(rs.getString("expire"));
+				out.println("</td><td class=\"DataTD\">a</td><td class=\"DataTD\">a</td></tr>");
 			}
-			DataTable t = new DataTable() {
-
-				@Override
-				protected LinkedList<Cell> getTableContent() {
-					return cells;
-				}
-
-				@Override
-				protected String[] getColumns() {
-					return new String[] { "Renew/Revoke/Delete", "Status",
-							"Email Address", "SerialNumber", "Revoked",
-							"Expires", "Login", "Comment*" };
-				}
-			};
-			t.output(out, l, vars);
-			out.println("</form>");
+			out.println("</table>");
 		} catch (SQLException e) {
 			e.printStackTrace();
 		}