From ae8917f3a8a3b15b279565a7f40556eb1b7de232 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Felix=20D=C3=B6rre?= <felix@dogcraft.de>
Date: Fri, 11 Jul 2014 20:11:08 +0200
Subject: [PATCH] remove some of the remaining "dataTD"s

---
 .../gigi/pages/account/MailOverview.java      |  6 +-
 src/org/cacert/gigi/pages/main/Signup.templ   | 66 ++++++++++---------
 .../cacert/gigi/pages/wot/AssuranceForm.templ | 52 ++++++++-------
 .../cacert/gigi/pages/wot/AssureeSearch.templ | 18 +++--
 4 files changed, 76 insertions(+), 66 deletions(-)

diff --git a/src/org/cacert/gigi/pages/account/MailOverview.java b/src/org/cacert/gigi/pages/account/MailOverview.java
index 3e8da14a..fa69e8e3 100644
--- a/src/org/cacert/gigi/pages/account/MailOverview.java
+++ b/src/org/cacert/gigi/pages/account/MailOverview.java
@@ -62,18 +62,18 @@ public class MailOverview extends Page {
 				String usM = (String) vars.get(userMail);
 				while (rs.next()) {
 					out.println("<tr>");
-					out.println("<td class=\"DataTD\"><input type=\"radio\" name=\"emailid\" value=\"");
+					out.println("<td><input type=\"radio\" name=\"emailid\" value=\"");
 					int mailID = rs.getInt(1);
 					out.print(mailID);
 					out.print("\"/></td>");
-					out.println("<td class=\"DataTD\">");
+					out.println("<td>");
 					if (rs.getString(7).isEmpty()) {
 						out.print(l.getTranslation("Verified"));
 					} else {
 						out.print(l.getTranslation("Unverified"));
 					}
 					out.print("</td>");
-					out.println("<td class=\"DataTD\">");
+					out.println("<td>");
 					String address = rs.getString(3);
 					if (usM.equals(address)) {
 						out.print(l.getTranslation("N/A"));
diff --git a/src/org/cacert/gigi/pages/main/Signup.templ b/src/org/cacert/gigi/pages/main/Signup.templ
index 2cb5ade4..749ab26f 100644
--- a/src/org/cacert/gigi/pages/main/Signup.templ
+++ b/src/org/cacert/gigi/pages/main/Signup.templ
@@ -1,81 +1,83 @@
-<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper" width="400">
+<table class="wrapper dataTable" width="400">
+  <thead>
   <tr>
-    <td colspan="3" class="title"><?=_My Details?></td>
+    <th colspan="3"><?=_My Details?></th>
   </tr>
-
+  </thead>
+  <tbody>
   <tr>
-    <td class="DataTD" width="125"><?=_First Name?>: </td>
-    <td class="DataTD" width="125"><input type="text" name="fname" size="30" value="<?=$fname?>" autocomplete="off"></td>
-    <td rowspan="4" class="DataTD" width="125"><?=$helpOnNames?></td>
+    <td width="125"><?=_First Name?>: </td>
+    <td width="125"><input type="text" name="fname" size="30" value="<?=$fname?>" autocomplete="off"></td>
+    <td rowspan="4" width="125"><?=$helpOnNames?></td>
   </tr>
 
   <tr>
-    <td class="DataTD" valign="top"><?=_Middle Name(s)?><br>
+    <td valign="top"><?=_Middle Name(s)?><br>
       (<?=_optional?>)
     </td>
-    <td class="DataTD"><input type="text" name="mname" size="30" value="<?=$mname?>" autocomplete="off"></td>
+    <td><input type="text" name="mname" size="30" value="<?=$mname?>" autocomplete="off"></td>
   </tr>
 
   <tr>
-    <td class="DataTD"><?=_Last Name?>: </td>
-    <td class="DataTD"><input type="text" name="lname" size="30" value="<?=$lname?>" autocomplete="off"></td>
+    <td><?=_Last Name?>: </td>
+    <td><input type="text" name="lname" size="30" value="<?=$lname?>" autocomplete="off"></td>
   </tr>
 
   <tr>
-    <td class="DataTD"><?=_Suffix?><br>
+    <td><?=_Suffix?><br>
       (<?=_optional?>)</td>
-    <td class="DataTD"><input type="text" name="suffix" size="30" value="<?=$suffix?>" autocomplete="off"><br><?=_Please only write Name Suffixes into this field.?></td>
+    <td><input type="text" name="suffix" size="30" value="<?=$suffix?>" autocomplete="off"><br><?=_Please only write Name Suffixes into this field.?></td>
   </tr>
 
   <tr>
-    <td class="DataTD"><?=_Date of Birth?><br>
+    <td><?=_Date of Birth?><br>
 	    (<?=_dd/mm/yyyy?>)</td>
-    <td class="DataTD"><?=$dob?></td>
-    <td class="DataTD">&nbsp;</td>
+    <td><?=$dob?></td>
+    <td>&nbsp;</td>
   </tr>
 
   <tr>
-    <td class="DataTD"><?=_Email Address?>: </td>
-    <td class="DataTD"><input type="text" name="email" size="30" value="<?=$email?>" autocomplete="off"></td>
-    <td class="DataTD"><?=_I own or am authorised to control this email address?></td>
+    <td><?=_Email Address?>: </td>
+    <td><input type="text" name="email" size="30" value="<?=$email?>" autocomplete="off"></td>
+    <td><?=_I own or am authorised to control this email address?></td>
   </tr>
 
   <tr>
-    <td class="DataTD"><?=_Pass Phrase?><font color="red">*</font>: </td>
-    <td class="DataTD"><input type="password" name="pword1" size="30" autocomplete="off"></td>
-    <td class="DataTD" rowspan="2">&nbsp;</td>
+    <td><?=_Pass Phrase?><font color="red">*</font>: </td>
+    <td><input type="password" name="pword1" size="30" autocomplete="off"></td>
+    <td rowspan="2">&nbsp;</td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_Pass Phrase Again?><font color="red">*</font>: </td>
-    <td class="DataTD"><input type="password" name="pword2" size="30" autocomplete="off"></td>
+    <td><?=_Pass Phrase Again?><font color="red">*</font>: </td>
+    <td><input type="password" name="pword2" size="30" autocomplete="off"></td>
   </tr>
 
   <tr>
-    <td class="DataTD" colspan="3"><font color="red">*</font><?=_Please note, in the interests of good security, the pass phrase must be made up of an upper case letter, lower case letter, number and symbol.?></td>
+    <td colspan="3"><font color="red">*</font><?=_Please note, in the interests of good security, the pass phrase must be made up of an upper case letter, lower case letter, number and symbol.?></td>
   </tr>
   <tr>
-    <td class="DataTD" colspan="3"><?=_It's possible to get notifications of up and coming events and even just general announcements, untick any notifications you don't wish to receive. For country, regional and radius notifications to work you must choose your location once you've verified your account and logged in.?></td>
+    <td colspan="3"><?=_It's possible to get notifications of up and coming events and even just general announcements, untick any notifications you don't wish to receive. For country, regional and radius notifications to work you must choose your location once you've verified your account and logged in.?></td>
   </tr>
 
   <tr>
-    <td class="DataTD" valign="top"><?=_Alert me if?>: </td>
-    <td class="DataTD" align="left">
+    <td valign="top"><?=_Alert me if?>: </td>
+    <td align="left">
         <input type="checkbox" name="general" value="1"<?=$general?>><?=_General Announcements?><br>
 	<input type="checkbox" name="country" value="1"<?=$country?>><?=_Country Announcements?><br>
 	<input type="checkbox" name="regional" value="1"<?=$regional?>><?=_Regional Announcements?><br>
 	<input type="checkbox" name="radius" value="1"<?=$radius?>><?=_Within 200km Announcements?></td>
-    <td class="DataTD">&nbsp;</td>
+    <td>&nbsp;</td>
   </tr>
 
   <tr>
-    <td class="DataTD" colspan="3"><?=_When you click on next, we will send a confirmation email to the email address you have entered above.?></td>
+    <td colspan="3"><?=_When you click on next, we will send a confirmation email to the email address you have entered above.?></td>
   </tr>
   <tr>
-    <td class="DataTD" colspan="3"><input type="checkbox" name="cca_agree" value="1"><?=_I agree to the terms and conditions of the CAcert Community Agreement?>: <a href="/policy/CAcertCommunityAgreement.php">http://www.cacert.org/policy/CAcertCommunityAgreement.php</a></td>
+    <td colspan="3"><input type="checkbox" name="cca_agree" value="1"><?=_I agree to the terms and conditions of the CAcert Community Agreement?>: <a href="/policy/CAcertCommunityAgreement.php">http://www.cacert.org/policy/CAcertCommunityAgreement.php</a></td>
   </tr>
 
   <tr>
-    <td class="DataTD" colspan="3"><input type="submit" name="process" value="<?=_Next?>"></td>
+    <td colspan="3"><input type="submit" name="process" value="<?=_Next?>"></td>
   </tr>
-
+  </tbody>
 </table>
diff --git a/src/org/cacert/gigi/pages/wot/AssuranceForm.templ b/src/org/cacert/gigi/pages/wot/AssuranceForm.templ
index bae39606..79ae81c6 100644
--- a/src/org/cacert/gigi/pages/wot/AssuranceForm.templ
+++ b/src/org/cacert/gigi/pages/wot/AssuranceForm.templ
@@ -1,56 +1,60 @@
-<table class="wrapper" width="600">
-<tr><td colspan="2" class="title"><?=_Assurance Confirmation?></td></tr>
-<tr><td colspan="2" class="DataTD"><?=s,$name,Please check the following details match against what you witnessed when you met %s in person. You MUST NOT proceed unless you are sure the details are correct. You may be held responsible by the CAcert Arbitrator for any issues with this Assurance.?>
+<table class="wrapper dataTable" width="600">
+<thead>
+<tr><th colspan="2"><?=_Assurance Confirmation?></th></tr>
+</thead>
+<tbody>
+<tr><td colspan="2"><?=s,$name,Please check the following details match against what you witnessed when you met %s in person. You MUST NOT proceed unless you are sure the details are correct. You may be held responsible by the CAcert Arbitrator for any issues with this Assurance.?>
 </td></tr>
 
 	<tr>
-		<td class="DataTD"><?=_Name?>: </td>
-		<td class="DataTD"><span class="accountdetail"><?=$name?></span></td>
+		<td><?=_Name?>: </td>
+		<td><span class="accountdetail"><?=$name?></span></td>
 	</tr>
 	<tr>
-		<td class="DataTD"><?=_Date of Birth?>: </td>
-		<td class="DataTD"><span class="accountdetail dob"><?=$dob?></span></td>
+		<td><?=_Date of Birth?>: </td>
+		<td><span class="accountdetail dob"><?=$dob?></span></td>
 	</tr>
 	<tr>
-		<td class="DataTD"><input type="checkbox" name="certify" value="1"></td>
-		<td class="DataTD"><?=s,$name,I certify that %s has appeared in person.?></td>
+		<td><input type="checkbox" name="certify" value="1"></td>
+		<td><?=s,$name,I certify that %s has appeared in person.?></td>
 	</tr>
 	<tr>
-		<td class="DataTD"><input type="checkbox" name="CCAAgreed" value="1"></td>
-		<td class="DataTD"><?=s,$name,I verify that %s has accepted the CAcert Community Agreement.?></td>
+		<td><input type="checkbox" name="CCAAgreed" value="1"></td>
+		<td><?=s,$name,I verify that %s has accepted the CAcert Community Agreement.?></td>
 	</tr>
 	<tr>
-		<td class="DataTD"><?=_Location?></td>
-		<td class="DataTD"><input type="text" name="location"></td>
+		<td><?=_Location?></td>
+		<td><input type="text" name="location"></td>
 	</tr>
 	<tr>
-		<td class="DataTD"><?=_Date?></td>
-		<td class="DataTD"><input type="text" name="date"><br/><?=_The date when the assurance took place. Please adjust the date if you assured the person on a different day (YYYY-MM-DD).?></td>
+		<td><?=_Date?></td>
+		<td><input type="text" name="date"><br/><?=_The date when the assurance took place. Please adjust the date if you assured the person on a different day (YYYY-MM-DD).?></td>
 	</tr>
 	<tr>
-		<td class="DataTD"><input type="checkbox" name="assertion" value="1"></td>
-		<td class="DataTD"><?=_I believe that the assertion of identity I am making is correct, complete and verifiable. I have seen original documentation attesting to this identity. I accept that the CAcert Arbitrator may call upon me to provide evidence in any dispute, and I may be held responsible.?></td>
+		<td><input type="checkbox" name="assertion" value="1"></td>
+		<td><?=_I believe that the assertion of identity I am making is correct, complete and verifiable. I have seen original documentation attesting to this identity. I accept that the CAcert Arbitrator may call upon me to provide evidence in any dispute, and I may be held responsible.?></td>
 	</tr>
 	<tr>
-		<td class="DataTD"><input type="checkbox" name="rules" value="1"></td>
-		<td class="DataTD"><?=_I have read and understood the CAcert Community Agreement (CCA), Assurance Policy and the Assurance Handbook. I am making this Assurance subject to and in compliance with the CCA, Assurance policy and handbook.?></td>
+		<td><input type="checkbox" name="rules" value="1"></td>
+		<td><?=_I have read and understood the CAcert Community Agreement (CCA), Assurance Policy and the Assurance Handbook. I am making this Assurance subject to and in compliance with the CCA, Assurance policy and handbook.?></td>
 	</tr>
 	<tr>
-		<td class="DataTD"><?=_Policy?>: </td>
-		<td class="DataTD">
+		<td><?=_Policy?>: </td>
+		<td>
 			<a href="/policy/CAcertCommunityAgreement.php" target="_blank"><?=_CAcert Community Agreement?></a>
 			 - <a href="/policy/AssurancePolicy.php" target="_blank"><?=_Assurance Policy?></a>
 			 - <a href="http://wiki.cacert.org/AssuranceHandbook2" target="_blank"><?=_Assurance Handbook?></a>
 		</td>
 	</tr>
 	<tr>
-		<td class="DataTD"><?=_Points?></td>
-		<td class="DataTD"><input type="text" name="points"><br/>(Max. <?=$maxpoints?>)</td>
+		<td><?=_Points?></td>
+		<td><input type="text" name="points"><br/>(Max. <?=$maxpoints?>)</td>
 	</tr>
 	<tr>
-		<td class="DataTD" colspan="2">
+		<td colspan="2">
 			<input type="submit" name="process" value="<?=_I confirm this Assurance?>" />
 			<input type="submit" name="cancel" value="<?=_Cancel?>" />
 		</td>
 	</tr>
+	</tbody>
 </table>
diff --git a/src/org/cacert/gigi/pages/wot/AssureeSearch.templ b/src/org/cacert/gigi/pages/wot/AssureeSearch.templ
index cd1cb28b..281c472e 100644
--- a/src/org/cacert/gigi/pages/wot/AssureeSearch.templ
+++ b/src/org/cacert/gigi/pages/wot/AssureeSearch.templ
@@ -1,19 +1,23 @@
 <form method="POST">
-<table class="wrapper" width="300">
+<table class="wrapper dataTable" width="300">
+  <thead>
   <tr>
-    <td colspan="2" class="title"><?=_Assure Someone?></td>
+    <th colspan="2" class="title"><?=_Assure Someone?></th>
   </tr>
+  </thead>
+  <tbody>
   <tr>
-    <td class="DataTD" width="125"><?=_Email?>: </td>
-    <td class="DataTD" width="125"><input type="text" name="email"></td>
+    <td width="125"><?=_Email?>: </td>
+    <td width="125"><input type="text" name="email"></td>
   </tr>
   <tr>
-    <td class="DataTD" width="125"><?=_Date of Birth?><br>
+    <td width="125"><?=_Date of Birth?><br>
 	    (<?=_dd/mm/yyyy?>)</td>
-    <td class="DataTD" width="125"><?=$DoB?></td>
+    <td width="125"><?=$DoB?></td>
   </tr>
   <tr>
-    <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_Next?>"></td>
+    <td colspan="2"><input type="submit" name="process" value="<?=_Next?>"></td>
   </tr>
+  </tbody>
 </table>
 </form>
-- 
2.39.2