From c009e77f64997e3cfd8164adde9f0bfba9a5ee83 Mon Sep 17 00:00:00 2001
From: Janis Streib <janis@dogcraft.de>
Date: Wed, 9 Jul 2014 23:57:43 +0200
Subject: [PATCH] UPD: Slight css/table cleanup

---
 .../pages/account/ChangePasswordForm.templ    | 22 ++++---
 .../pages/account/MailCertificateAdd.templ    | 46 ++++++++-------
 .../cacert/gigi/pages/account/MyDetails.templ | 30 +++++-----
 .../gigi/pages/account/mailOverview.templ     | 34 ++++++-----
 static/static/default.css                     | 57 +++++++++++--------
 5 files changed, 108 insertions(+), 81 deletions(-)

diff --git a/src/org/cacert/gigi/pages/account/ChangePasswordForm.templ b/src/org/cacert/gigi/pages/account/ChangePasswordForm.templ
index 5c476647..a3e8603d 100644
--- a/src/org/cacert/gigi/pages/account/ChangePasswordForm.templ
+++ b/src/org/cacert/gigi/pages/account/ChangePasswordForm.templ
@@ -1,23 +1,27 @@
-<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper" width="400">
+<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper dataTable" width="400">
+  <thead>
   <tr>
     <td colspan="2" class="title"><?=_Change Pass Phrase?></td>
   </tr>
+  </thead>
+  <tbody>
   <tr>
-    <td class="DataTD"><?=_Old Pass Phrase?>: </td>
-    <td class="DataTD"><input type="password" name="oldpassword"></td>
+    <td><?=_Old Pass Phrase?>: </td>
+    <td><input type="password" name="oldpassword"></td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_New Pass Phrase?><span class="formMandatory">*</span>: </td>
-    <td class="DataTD"><input type="password" name="pword1"></td>
+    <td><?=_New Pass Phrase?><span class="formMandatory">*</span>: </td>
+    <td><input type="password" name="pword1"></td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_Pass Phrase Again?><span class="formMandatory">*</span>: </td>
-    <td class="DataTD"><input type="password" name="pword2"></td>
+    <td><?=_Pass Phrase Again?><span class="formMandatory">*</span>: </td>
+    <td><input type="password" name="pword2"></td>
   </tr>
   <tr>
-    <td class="DataTD" colspan="2"><span class="formMandatory">*</span><?=_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 (all white spaces at the beginning and end are removed).?></td>
+    <td colspan="2"><span class="formMandatory">*</span><?=_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 (all white spaces at the beginning and end are removed).?></td>
   </tr>
   <tr>
-    <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_Update Pass Phrase?>"></td>
+    <td colspan="2"><input type="submit" name="process" value="<?=_Update Pass Phrase?>"></td>
   </tr>
+  </tbody>
 </table>
diff --git a/src/org/cacert/gigi/pages/account/MailCertificateAdd.templ b/src/org/cacert/gigi/pages/account/MailCertificateAdd.templ
index 3d479caf..91fffdce 100644
--- a/src/org/cacert/gigi/pages/account/MailCertificateAdd.templ
+++ b/src/org/cacert/gigi/pages/account/MailCertificateAdd.templ
@@ -8,23 +8,26 @@
 <p><?=_If the Subscriber's name and/or domain name registration change the subscriber will immediately inform CAcert Inc. who shall revoke the digital certificate. When the Digital Certificate expires or is revoked the company will permanently remove the certificate from the server on which it is installed and will not use it for any purpose thereafter. The person responsible for key management and security is fully authorized to install and utilize the certificate to represent this organization's electronic presence.?></p>
 
 <form method="post">
-<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
+<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper dataTable">
+  <thead>
   <tr>
     <td colspan="2" class="title"><?=_New Client Certificate?></td>
   </tr>
+  </thead>
+  <tbody>
   <tr>
-    <td class="DataTD"><?=_Add?></td>
-    <td class="DataTD"><?=_Address?></td>
+    <td><?=_Add?></td>
+    <td><?=_Address?></td>
   </tr>
 <!-- For each mail -->
   <tr>
-    <td class="DataTD"><input type="checkbox" id="addid<=intval($row['id'])>" name="addid[]" value="<=intval($row['id'])>"></td>
-    <td class="DataTD" align="left"><label for="addid<=intval($row['id'])>"><=sanitizeHTML($row['email'])></label></td>
+    <td><input type="checkbox" id="addid<=intval($row['id'])>" name="addid[]" value="<=intval($row['id'])>"></td>
+    <td align="left"><label for="addid<=intval($row['id'])>"><=sanitizeHTML($row['email'])></label></td>
   </tr>
 <!-- For each mail -->
 <!-- if points > 50 -->
   <tr>
-    <td class="DataTD" colspan="2" align="left">
+    <td colspan="2" align="left">
       <input type="radio" id="incname0" name="incname" value="0" checked="checked" />
         <label for="incname0"><?=_No Name?></label><br />
         <input type="radio" id="incname1" name="incname" value="1" />
@@ -33,33 +36,33 @@
   </tr>
 
   <tr>
-    <td class="DataTD">
+    <td>
       <input type="checkbox" id="login" name="login" value="1" checked="checked" />
     </td>
-    <td class="DataTD" align="left">
+    <td align="left">
       <label for="login"><?=_Enable certificate login with this certificate?><br />
       <?=_By allowing certificate login, this certificate can be used to login into this account at https://secure.cacert.org/ .?></label>
     </td>
   </tr>
   <tr>
-    <td class="DataTD" colspan="2" align="left">
+    <td colspan="2" align="left">
       <label for="description"><?=_Optional comment, only used in the certificate overview?></label><br />
       <input type="text" id="description" name="description" maxlength="100" size="100" />
     </td>
   </tr>
 
   <tr class="expertoff">
-    <td class="DataTD">
+    <td>
       <input type="checkbox" id="expertbox" name="expertbox"/>
     </td>
-    <td class="DataTD" align="left">
+    <td align="left">
       <label for="expertbox"><?=_Show advanced options?></label>
     </td>
   </tr>
 
 <!-- if >50 points -->
   <tr class="expert">
-    <td class="DataTD" colspan="2" align="left">
+    <td colspan="2" align="left">
       <input type="radio" id="root1" name="rootcert" value="1" /> <label for="root1"><?=_Sign by class 1 root certificate?></label><br />
       <input type="radio" id="root2" name="rootcert" value="2" checked="checked" /> <label for="root2"><?=_Sign by class 3 root certificate?></label><br />
       <?=_Please note: If you use a certificate signed by the class 3 root, the class 3 root certificate needs to be imported into your email program as well as the class 1 root certificate so your email program can build a full trust path chain.?>
@@ -68,7 +71,7 @@
 <!-- if >50 points -->
 
   <tr class="expert">
-    <td class="DataTD" colspan="2" align="left">
+    <td colspan="2" align="left">
       <?=_Hash algorithm used when signing the certificate:?><br />
       <!-- Hash algs!!! -->
     </td>
@@ -76,10 +79,10 @@
 
 <!-- if codesign -->
   <tr class="expert">
-    <td class="DataTD">
+    <td>
       <input type="checkbox" id="codesign" name="codesign" value="1" />
     </td>
-    <td class="DataTD" align="left">
+    <td align="left">
       <label for="codesign"><?=_Code Signing?><br />
       <?=_Please note: By ticking this box you will automatically have your name included in the certificate.?></label>
     </td>
@@ -87,10 +90,10 @@
 <!-- if codesign -->
 
   <tr class="expert">
-    <td class="DataTD">
+    <td>
       <input type="checkbox" id="SSO" name="SSO" value="1" />
     </td>
-    <td class="DataTD" align="left">
+    <td align="left">
       <label for="SSO"><?=_Add Single Sign On ID Information?><br />
       <?=_By adding Single Sign On (SSO) ID information to your certificates this could be used to track you, you can also issue certificates with no email addresses that are useful only for Authentication. Please see a more detailed description on our WIKI about it.?>
       <a href="http://wiki.cacert.org/wiki/SSO"><?=_SSO WIKI Entry?></a></label>
@@ -98,7 +101,7 @@
   </tr>
 
   <tr class="expert">
-    <td class="DataTD" colspan="2">
+    <td colspan="2">
       <label for="optionalCSR"><?=_Optional Client CSR, no information on the certificate will be used?></label><br />
       <textarea id="optionalCSR" name="optionalCSR" cols="80" rows="5"></textarea>
     </td>
@@ -106,16 +109,17 @@
 
 
   <tr>
-    <td class="DataTD">
+    <td>
       <input type="checkbox" id="CCA" name="CCA" />
     </td>
-    <td class="DataTD" align="left">
+    <td align="left">
       <label for="CCA"><strong><?=s,$CCA,I accept the CAcert Community Agreement (%s).?> </strong><br />
       <?=_Please note: You need to accept the CCA to proceed.?></label>
     </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>
\ No newline at end of file
diff --git a/src/org/cacert/gigi/pages/account/MyDetails.templ b/src/org/cacert/gigi/pages/account/MyDetails.templ
index 4a758430..9803a888 100644
--- a/src/org/cacert/gigi/pages/account/MyDetails.templ
+++ b/src/org/cacert/gigi/pages/account/MyDetails.templ
@@ -1,31 +1,34 @@
 <form method="post" action="/account/myDetails">
-<table class="wrapper" width="400">
+<table class="wrapper dataTable" width="400">
+<thead>
   <tr>
-    <td colspan="2" class="title"><?=_My Details?></td>
+    <td colspan="2"><?=_My Details?></td>
   </tr>
+  </thead>
+  <tbody>
   <tr>
-    <td class="DataTD" width="125"><?=_First Name?>: </td>
-    <td class="DataTD" width="125"><input type="text" name="fname" value="<?=$fname?>"></td>
+    <td width="125"><?=_First Name?>: </td>
+    <td width="125"><input type="text" name="fname" value="<?=$fname?>"></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" value="<?=$mname?>"></td>
+    <td><input type="text" name="mname" value="<?=$mname?>"></td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_Last Name?>: </td>
-    <td class="DataTD"><input type="text" name="lname" value="<?=$lname?>"></td>
+    <td><?=_Last Name?>: </td>
+    <td><input type="text" name="lname" value="<?=$lname?>"></td>
   </tr>
   <tr>
-    <td class="DataTD"><?=_Suffix?><br>
+    <td><?=_Suffix?><br>
       (<?=_optional?>)</td>
-    <td class="DataTD"><input type="text" name="suffix" value="<?=$suffix?>"></td>
+    <td><input type="text" name="suffix" value="<?=$suffix?>"></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><?=$DoB?></td>
   </tr>
   <tr>
     <td colspan="2" class="title"><?=_('Show account history')?></td>
@@ -34,7 +37,8 @@
     <td colspan="2" class="title"><?=_View secret question & answers and OTP phrases?></td>
   </tr>
   <?=$details?>
-  <tr><td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_Update?>"></td>
+  <tr><td colspan="2"><input type="submit" name="process" value="<?=_Update?>"></td>
   </tr>
+  </tbody>
 </table>
 </form>
diff --git a/src/org/cacert/gigi/pages/account/mailOverview.templ b/src/org/cacert/gigi/pages/account/mailOverview.templ
index 746f0c10..379162b8 100644
--- a/src/org/cacert/gigi/pages/account/mailOverview.templ
+++ b/src/org/cacert/gigi/pages/account/mailOverview.templ
@@ -1,34 +1,40 @@
-<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
+<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper dataTable">
+  <thead>
   <tr>
-    <td colspan="4" class="title"><?=_Email Accounts?></td>
+    <td colspan="4"><?=_Email Accounts?></td>
   </tr>
+  </thead>
+  <tbody>
   <tr>
-    <td class="DataTD"><?=_Default?></td>
-    <td class="DataTD"><?=_Status?></td>
-    <td class="DataTD"><?=_Delete?></td>
-    <td class="DataTD"><?=_Address?></td>
+    <td><?=_Default?></td>
+    <td><?=_Status?></td>
+    <td><?=_Delete?></td>
+    <td><?=_Address?></td>
   </tr>
  <?=$mailData?>
   <tr>
-    <td class="DataTD" colspan="2"><input type="submit" name="makedefault" value="Setze als Standard"></td>
-    <td class="DataTD" colspan="2"><input type="submit" name="process" value="Löschen"></td>
+    <td colspan="2"><input type="submit" name="makedefault" value="Setze als Standard"></td>
+    <td colspan="2"><input type="submit" name="process" value="Löschen"></td>
   </tr>
+  </tbody>
 </table>
 <p>
 <?=_Please Note: You can not set an unverified account as a default account, and you can not remove a default account. To remove the default account you must set another verified account as the default.?>
 </p>
 <br/>
-<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper">
-  <tbody><tr>
+<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper dataTable">
+  <thead>
+  <tr>
     <td colspan="2" class="title"><?=_Add Email?></td>
   </tr>
-
+  </thead>
+<tbody>
   <tr>
-    <td class="DataTD" width="125"><?=_Email Addresses?> </td>
-    <td class="DataTD" width="125"><input type="text" name="newemail" value=""></td>
+    <td width="125"><?=_Email Addresses?> </td>
+    <td width="125"><input type="text" name="newemail" value=""></td>
   </tr>
   <tr>
-    <td class="DataTD" colspan="2"><input type="submit" name="process" value="<?=_I own or am authorised to control this email address?>"></td>
+    <td colspan="2"><input type="submit" name="process" value="<?=_I own or am authorised to control this email address?>"></td>
   </tr>
 </tbody></table>
 <p>
diff --git a/static/static/default.css b/static/static/default.css
index be04c421..d62345c1 100644
--- a/static/static/default.css
+++ b/static/static/default.css
@@ -509,30 +509,6 @@ td.storyLeft {
 
 
 /********************* end **********************/
-
-.DataTD input, .DataTD textarea {
-	font-size: 92%;
-}
-
-.DataTD select, .DataTD option {
-	font-size: 92%;
-}
-
-.DataTD {
-	background-color: #e2e2e2;
-	border-style: inset;
-	border-width: 1px;
-	font-size: 8pt;
-	color: #000000;
-	font-family: Arial, Tahoma, Verdana, Helvetica, sans-serif;
-
-	background: #ffffff;
-	padding: 1px 5px 1px 5px;
-	border: 1px #cfcfcf solid;
-	border-left: 1px #cfcfcf dotted;
-	border-right: 1px #cfcfcf dotted;
-}
-
 .DataTDGrey {
 	background-color: #EFEDED;
 	border-style: inset;
@@ -748,4 +724,37 @@ formMandatory{
 pre{
 	word-wrap: break-word;
 	white-space: pre-wrap;
+}
+
+.dataTable td {
+	background-color: #e2e2e2;
+	border-style: inset;
+	border-width: 1px;
+	font-size: 8pt;
+	color: #000000;
+	font-family: Arial, Tahoma, Verdana, Helvetica, sans-serif;
+
+	background: #ffffff;
+	padding: 1px 5px 1px 5px;
+	border: 1px #cfcfcf solid;
+	border-left: 1px #cfcfcf dotted;
+	border-right: 1px #cfcfcf dotted;
+}
+
+.dataTable thead td {
+	background: #e2e2e2;
+	font-weight: bold;
+	padding: 1px 5px 1px 5px;
+	border: 1px solid #cfcfcf;
+	border-bottom: 3px double #cfcfcf;
+	border-top: 1px solid #656565;
+	text-align: center;
+}
+
+.dataTable input, .dataTable textarea {
+	font-size: 92%;
+}
+
+.dataTable select, .dataTable option {
+	font-size: 92%;
 }
\ No newline at end of file
-- 
2.39.2