From 378cbeb4324adbf7b729c6bf2f8cc50f1b2d918c Mon Sep 17 00:00:00 2001
From: Janis Streib <janis@dogcraft.de>
Date: Tue, 12 Apr 2016 02:28:35 +0200
Subject: [PATCH] UPD: cleanup tables

---
 src/org/cacert/gigi/Gigi.templ                | 20 ++-----------------
 .../gigi/output/AssurancesDisplay.templ       |  2 +-
 .../cacert/gigi/output/CertificateTable.templ |  2 +-
 .../cacert/gigi/pages/PasswordResetForm.templ |  2 +-
 .../pages/account/ChangePasswordForm.templ    |  2 +-
 .../cacert/gigi/pages/account/History.templ   |  2 +-
 .../gigi/pages/account/MyDetailsForm.templ    |  6 +++---
 .../pages/account/MyDetailsFormAssured.templ  |  6 +++---
 .../pages/account/MyOrganisationsForm.templ   |  2 +-
 .../gigi/pages/account/UserTrainings.templ    |  2 +-
 .../account/certs/CertificateIssueForm.templ  |  4 ++--
 .../account/certs/RequestCertificate.templ    |  4 ++--
 .../pages/account/domain/DomainAddForm.templ  |  2 +-
 .../account/domain/DomainManagementForm.templ |  2 +-
 .../account/domain/DomainPinglogForm.templ    |  4 ++--
 .../gigi/pages/account/mail/MailAddForm.templ |  6 +++---
 .../account/mail/MailManagementForm.templ     |  2 +-
 .../gigi/pages/admin/TTPAdminForm.templ       |  2 +-
 .../gigi/pages/admin/TTPAdminPage.templ       |  2 +-
 .../pages/admin/support/FindDomainForm.templ  |  2 +-
 .../pages/admin/support/FindUserForm.templ    |  4 ++--
 .../support/SupportEnterTicketForm.templ      |  2 +-
 .../SupportRevokeCertificatesForm.templ       |  2 +-
 .../support/SupportUserDetailsForm.templ      |  4 ++--
 .../support/SupportUserDetailsPage.templ      |  6 ++----
 src/org/cacert/gigi/pages/main/Signup.templ   | 10 +++++-----
 .../gigi/pages/orga/AffiliationForm.templ     |  2 +-
 .../gigi/pages/orga/CreateOrgForm.templ       |  2 +-
 .../gigi/pages/orga/OrgDomainAddForm.templ    |  2 +-
 src/org/cacert/gigi/pages/orga/ViewOrgs.templ |  2 +-
 .../cacert/gigi/pages/wot/AssuranceForm.templ |  2 +-
 .../cacert/gigi/pages/wot/AssureeSearch.templ | 10 +++++-----
 .../cacert/gigi/pages/wot/MyListingForm.templ |  2 +-
 .../gigi/pages/wot/RequestTTPForm.templ       |  2 +-
 .../org/cacert/gigi/pages/Manager.templ       |  4 ++--
 35 files changed, 57 insertions(+), 75 deletions(-)

diff --git a/src/org/cacert/gigi/Gigi.templ b/src/org/cacert/gigi/Gigi.templ
index af183a27..82d61094 100644
--- a/src/org/cacert/gigi/Gigi.templ
+++ b/src/org/cacert/gigi/Gigi.templ
@@ -28,7 +28,7 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <a class="navbar-brand" href="#"><img alt="CAcert" src="<?=$static?>/images/cacert4.png"></a>
+      <a class="navbar-brand" href="#">SomeCA Frontend</a>
     </div>
 
     <!-- Collect the nav links, forms, and other content for toggling -->
@@ -48,22 +48,6 @@
 			<div class="content"><?=$content?></div>
 	</div>
 	<hr/>
-		<div class="sponsorinfo">
-			<?=_CAcert operations are sponsored by?>
-			<a href="http://www.bit.nl/" target="_blank">
-				<img class="sponsorlogo" src="<?=$static?>/images/bit.png" alt="[BIT logo]">
-			</a>
-			<a href="http://www.tunix.nl/" target="_blank">
-				<img class="sponsorlogo" src="<?=$static?>/images/tunix.png" alt="[TUNIX logo]">
-			</a>
-			<a href="http://www.nlnet.nl/" target="_blank">
-				<img class="sponsorlogo" src="<?=$static?>/images/nlnet.png" alt="[NLnet logo]">
-			</a>
-			<a href="http://www.openarchitecturenetwork.org/" target="_blank">
-				<img class="sponsorlogo" src="<?=$static?>/images/oan.png" alt="[OAN logo]">
-			</a>
-		</div>
-	
 		<div id="siteInfo">
 			<a href="//wiki.cacert.org/FAQ/AboutUs"><?=_About Us?></a> |
 			<a href="/index.php?id=13"><?=_Donations?></a> |
@@ -71,7 +55,7 @@
 			<a href="/policy/PrivacyPolicy.html"><?=_Privacy Policy?></a> |
 			<a href="/index.php?id=51"><?=_Mission Statement?></a> |
 			<a href="/index.php?id=11"><?=_Contact Us?></a> |
-			©2002-<?=$year?> <?=_by CAcert?>
+			©2014-<?=$year?> SomeCA
 		</div>
 
 </body>
diff --git a/src/org/cacert/gigi/output/AssurancesDisplay.templ b/src/org/cacert/gigi/output/AssurancesDisplay.templ
index 18d9bc29..4a91eefa 100644
--- a/src/org/cacert/gigi/output/AssurancesDisplay.templ
+++ b/src/org/cacert/gigi/output/AssurancesDisplay.templ
@@ -1,4 +1,4 @@
-<table class="wrapper dataTable">
+<table class="table">
 <tr>
 <th colspan="7"><?=_Assurances?></th>
 </tr>
diff --git a/src/org/cacert/gigi/output/CertificateTable.templ b/src/org/cacert/gigi/output/CertificateTable.templ
index 1917d1fe..5a732ea9 100644
--- a/src/org/cacert/gigi/output/CertificateTable.templ
+++ b/src/org/cacert/gigi/output/CertificateTable.templ
@@ -1,4 +1,4 @@
-<table class="wrapper dataTable">
+<table class="table">
 <thead><tr>
 <th><?=_Renew/Revoke/Delete?></th>
 <th><?=_Status?></th>
diff --git a/src/org/cacert/gigi/pages/PasswordResetForm.templ b/src/org/cacert/gigi/pages/PasswordResetForm.templ
index 7193a3a4..61e1c2b4 100644
--- a/src/org/cacert/gigi/pages/PasswordResetForm.templ
+++ b/src/org/cacert/gigi/pages/PasswordResetForm.templ
@@ -1,4 +1,4 @@
-<table class="wrapper dataTable">
+<table class="table">
   <thead>
   <tr>
     <th colspan="2" class="title"><?=_Change Pass Phrase?></th>
diff --git a/src/org/cacert/gigi/pages/account/ChangePasswordForm.templ b/src/org/cacert/gigi/pages/account/ChangePasswordForm.templ
index 9a2a23ef..9b993836 100644
--- a/src/org/cacert/gigi/pages/account/ChangePasswordForm.templ
+++ b/src/org/cacert/gigi/pages/account/ChangePasswordForm.templ
@@ -1,4 +1,4 @@
-<table class="wrapper dataTable">
+<table class="table">
   <thead>
   <tr>
     <th colspan="2" class="title"><?=_Change Pass Phrase?></th>
diff --git a/src/org/cacert/gigi/pages/account/History.templ b/src/org/cacert/gigi/pages/account/History.templ
index 238f9c41..d6fe85af 100644
--- a/src/org/cacert/gigi/pages/account/History.templ
+++ b/src/org/cacert/gigi/pages/account/History.templ
@@ -1,4 +1,4 @@
-<table class="wrapper dataTable centertext">
+<table class="table">
 <tbody>
 <tr><th><?=_Support actions?></th></tr>
 <? foreach($entries) { ?>
diff --git a/src/org/cacert/gigi/pages/account/MyDetailsForm.templ b/src/org/cacert/gigi/pages/account/MyDetailsForm.templ
index ea1e9fca..5b2289be 100644
--- a/src/org/cacert/gigi/pages/account/MyDetailsForm.templ
+++ b/src/org/cacert/gigi/pages/account/MyDetailsForm.templ
@@ -1,4 +1,4 @@
-<table class="wrapper dataTable" width="400">
+<table class="table">
 <thead>
   <tr>
     <th colspan="2"><?=_My Details?></th>
@@ -6,8 +6,8 @@
   </thead>
   <tbody>
   <tr>
-    <td width="125"><?=_First Name?>: </td>
-    <td width="125"><input type="text" name="fname" value="<?=$fname?>"></td>
+    <td><?=_First Name?>: </td>
+    <td><input type="text" name="fname" value="<?=$fname?>"></td>
   </tr>
   <tr>
     <td valign="top"><?=_Middle Name(s)?><br>
diff --git a/src/org/cacert/gigi/pages/account/MyDetailsFormAssured.templ b/src/org/cacert/gigi/pages/account/MyDetailsFormAssured.templ
index b9699c2d..8cfb7705 100644
--- a/src/org/cacert/gigi/pages/account/MyDetailsFormAssured.templ
+++ b/src/org/cacert/gigi/pages/account/MyDetailsFormAssured.templ
@@ -1,4 +1,4 @@
-<table class="wrapper dataTable" width="400">
+<table class="table">
 <thead>
   <tr>
     <th colspan="2"><?=_My Details?></th>
@@ -6,8 +6,8 @@
   </thead>
   <tbody>
   <tr>
-    <td width="125"><?=_First Name?>: </td>
-    <td width="125"><?=$fname?></td>
+    <td><?=_First Name?>: </td>
+    <td><?=$fname?></td>
   </tr>
   <tr>
     <td valign="top"><?=_Middle Name(s)?><br>
diff --git a/src/org/cacert/gigi/pages/account/MyOrganisationsForm.templ b/src/org/cacert/gigi/pages/account/MyOrganisationsForm.templ
index babc09db..c0eb939d 100644
--- a/src/org/cacert/gigi/pages/account/MyOrganisationsForm.templ
+++ b/src/org/cacert/gigi/pages/account/MyOrganisationsForm.templ
@@ -1,6 +1,6 @@
 <input type='hidden' name='orgaForm' value='orga'/>
 <h2><?=_My Organisations?></h2>
-<table class="wrapper dataTable" width="400">
+<table class="table">
 <? foreach($orgas) { ?>
 <tr><td><?=$orgName?></td><td><?=$orgID?></td><td><input type='submit' value='<?=_switch to this organisation?>' name='org:<?=$orgID?>'/></td></tr>
 <? } ?>
diff --git a/src/org/cacert/gigi/pages/account/UserTrainings.templ b/src/org/cacert/gigi/pages/account/UserTrainings.templ
index b4eb0060..0e2667a0 100644
--- a/src/org/cacert/gigi/pages/account/UserTrainings.templ
+++ b/src/org/cacert/gigi/pages/account/UserTrainings.templ
@@ -1,4 +1,4 @@
-<table class="wrapper dataTable centertext">
+<table class="table">
 <tbody>
 <tr><th><?=_Trainings?></th></tr>
 <? foreach($entries) { ?>
diff --git a/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ b/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ
index 7b00f194..a6760aff 100644
--- a/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ
+++ b/src/org/cacert/gigi/pages/account/certs/CertificateIssueForm.templ
@@ -5,7 +5,7 @@
 
 <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>
 
-<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper dataTable">
+<table class="table">
   <thead>
   <tr>
     <th colspan="2" class="title"><?=_New Certificate?></th>
@@ -85,7 +85,7 @@
     </td>
   </tr>
   <tr>
-    <td colspan="2" align="left">
+    <td colspan="2">
       <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>
diff --git a/src/org/cacert/gigi/pages/account/certs/RequestCertificate.templ b/src/org/cacert/gigi/pages/account/certs/RequestCertificate.templ
index 20856226..d58bb072 100644
--- a/src/org/cacert/gigi/pages/account/certs/RequestCertificate.templ
+++ b/src/org/cacert/gigi/pages/account/certs/RequestCertificate.templ
@@ -1,5 +1,5 @@
 <form method="post">
-<table class="wrapper dataTable">
+<table class="table">
   <thead>
   <tr>
     <th colspan="2" class="title"><?=_New Certificate from CSR?></th>
@@ -23,7 +23,7 @@
 </form>
 <br>
 <form method="post">
-<table class="wrapper dataTable">
+<table class="table">
   <thead>
   <tr>
     <th colspan="2" class="title"><?=_New Certificate from newly generatey Key (SPKAC)?></th>
diff --git a/src/org/cacert/gigi/pages/account/domain/DomainAddForm.templ b/src/org/cacert/gigi/pages/account/domain/DomainAddForm.templ
index 9c6de6b5..cfcfec4e 100644
--- a/src/org/cacert/gigi/pages/account/domain/DomainAddForm.templ
+++ b/src/org/cacert/gigi/pages/account/domain/DomainAddForm.templ
@@ -1,4 +1,4 @@
-<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper dataTable">
+<table class="table">
   <thead>
   <tr>
     <th colspan="2" class="title"><?=_Add Domain?></th>
diff --git a/src/org/cacert/gigi/pages/account/domain/DomainManagementForm.templ b/src/org/cacert/gigi/pages/account/domain/DomainManagementForm.templ
index 0bdc9d37..32d77fe3 100644
--- a/src/org/cacert/gigi/pages/account/domain/DomainManagementForm.templ
+++ b/src/org/cacert/gigi/pages/account/domain/DomainManagementForm.templ
@@ -1,4 +1,4 @@
-<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper dataTable">
+<table class="table">
   <tbody><tr>
     <th colspan="3">Domains</th>
   </tr>
diff --git a/src/org/cacert/gigi/pages/account/domain/DomainPinglogForm.templ b/src/org/cacert/gigi/pages/account/domain/DomainPinglogForm.templ
index 291376b5..62038847 100644
--- a/src/org/cacert/gigi/pages/account/domain/DomainPinglogForm.templ
+++ b/src/org/cacert/gigi/pages/account/domain/DomainPinglogForm.templ
@@ -1,5 +1,5 @@
 <h2><?=_Ping log for?> '<?=$domainname?>'</h2>
-<table class="wrapper dataTable">
+<table class="table">
 <tr><th><?=_Type?></th>
 <th><?=_State?></th>
 <th><?=_Config?></th>
@@ -17,4 +17,4 @@
 </tr>
 <?}?>
 </table>
-<br/>
+
diff --git a/src/org/cacert/gigi/pages/account/mail/MailAddForm.templ b/src/org/cacert/gigi/pages/account/mail/MailAddForm.templ
index 40a6cf6f..ae2dccb4 100644
--- a/src/org/cacert/gigi/pages/account/mail/MailAddForm.templ
+++ b/src/org/cacert/gigi/pages/account/mail/MailAddForm.templ
@@ -1,4 +1,4 @@
-<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper dataTable">
+<table class="table">
   <thead>
   <tr>
     <th colspan="2" class="title"><?=_Add Email?></th>
@@ -6,8 +6,8 @@
   </thead>
 <tbody>
   <tr>
-    <td width="125"><?=_Email Addresses?> </td>
-    <td width="125"><input type="text" name="newemail" value=""></td>
+    <td><?=_Email Addresses?> </td>
+    <td><input type="text" name="newemail" value=""></td>
   </tr>
   <tr>
     <td colspan="2"><input type="submit" name="addmail" value="<?=_I own or am authorised to control this email address?>"></td>
diff --git a/src/org/cacert/gigi/pages/account/mail/MailManagementForm.templ b/src/org/cacert/gigi/pages/account/mail/MailManagementForm.templ
index e88190c3..3b8d9400 100644
--- a/src/org/cacert/gigi/pages/account/mail/MailManagementForm.templ
+++ b/src/org/cacert/gigi/pages/account/mail/MailManagementForm.templ
@@ -1,4 +1,4 @@
-<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper dataTable">
+<table class="table">
   <thead>
   <tr>
     <th colspan="4"><?=_Email Accounts?></th>
diff --git a/src/org/cacert/gigi/pages/admin/TTPAdminForm.templ b/src/org/cacert/gigi/pages/admin/TTPAdminForm.templ
index 1495d4a1..a3fd9f22 100644
--- a/src/org/cacert/gigi/pages/admin/TTPAdminForm.templ
+++ b/src/org/cacert/gigi/pages/admin/TTPAdminForm.templ
@@ -1,5 +1,5 @@
 <input type="hidden" name="uid" value="<?=$uid?>"/>
-<table class="dataTable wrapper">
+<table class="table">
 <tr><td><?=_Name?></td><td><?=$name?></td></tr>
 <tr><td><?=_Email?></td><td><?=$email?></td></tr>
 <tr><td><?=_Date of Birth?></td><td><?=$DoB?></td></tr>
diff --git a/src/org/cacert/gigi/pages/admin/TTPAdminPage.templ b/src/org/cacert/gigi/pages/admin/TTPAdminPage.templ
index 2e0de030..0a4b6a2e 100644
--- a/src/org/cacert/gigi/pages/admin/TTPAdminPage.templ
+++ b/src/org/cacert/gigi/pages/admin/TTPAdminPage.templ
@@ -1,4 +1,4 @@
-<table class="wrapper dataTable">
+<table class="table">
 <tr><th><?=_Name?></th><th><?=_Email?></th><th></th></tr>
 <? foreach($users) { ?>
 <tr><td><?=$name?></td><td><?=$email?></td><td><a href="/admin/ttp/<?=$id?>">Process</a></td></tr>
diff --git a/src/org/cacert/gigi/pages/admin/support/FindDomainForm.templ b/src/org/cacert/gigi/pages/admin/support/FindDomainForm.templ
index a35b1880..c6faf9cc 100644
--- a/src/org/cacert/gigi/pages/admin/support/FindDomainForm.templ
+++ b/src/org/cacert/gigi/pages/admin/support/FindDomainForm.templ
@@ -1,4 +1,4 @@
-<table class="wrapper dataTable">
+<table class="table">
   <tbody><tr>
     <th colspan="2"><?=_Find User by Domain?></th>
   </tr>
diff --git a/src/org/cacert/gigi/pages/admin/support/FindUserForm.templ b/src/org/cacert/gigi/pages/admin/support/FindUserForm.templ
index b48bf4fd..a10f57fa 100644
--- a/src/org/cacert/gigi/pages/admin/support/FindUserForm.templ
+++ b/src/org/cacert/gigi/pages/admin/support/FindUserForm.templ
@@ -1,6 +1,6 @@
 <? if($usertable) {?>
 <p>Multiple users where found.</p>
-<table class="dataTable wrapper">
+<table class="table">
 <tr>
 <th>Id</th><th>E-Mail</th></tr>
 <? foreach($usertable) {?>
@@ -9,7 +9,7 @@
 </table>
 <? } ?>
 <? if($first) {?>
-<table class="wrapper dataTable">
+<table class="table">
   <tbody><tr>
     <th colspan="2"><?=_Find User?></th>
   </tr>
diff --git a/src/org/cacert/gigi/pages/admin/support/SupportEnterTicketForm.templ b/src/org/cacert/gigi/pages/admin/support/SupportEnterTicketForm.templ
index 3f7c82c4..43a1c35c 100644
--- a/src/org/cacert/gigi/pages/admin/support/SupportEnterTicketForm.templ
+++ b/src/org/cacert/gigi/pages/admin/support/SupportEnterTicketForm.templ
@@ -1,4 +1,4 @@
-<table class="wrapper dataTable centertext">
+<table class="table">
 <tr>
             <th colspan="2"><?=_Ticket handling?></th>
         </tr>
diff --git a/src/org/cacert/gigi/pages/admin/support/SupportRevokeCertificatesForm.templ b/src/org/cacert/gigi/pages/admin/support/SupportRevokeCertificatesForm.templ
index 5fabb3cf..db141cda 100644
--- a/src/org/cacert/gigi/pages/admin/support/SupportRevokeCertificatesForm.templ
+++ b/src/org/cacert/gigi/pages/admin/support/SupportRevokeCertificatesForm.templ
@@ -1,4 +1,4 @@
-<table class="wrapper dataTable">
+<table class="table">
         <tbody><tr>
             <th colspan="6"><?=_Certificates?></td>
         </tr>
diff --git a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.templ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.templ
index 244bbdbc..f962b776 100644
--- a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.templ
+++ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsForm.templ
@@ -1,4 +1,4 @@
-<table class="wrapper dataTable centertext">
+<table class="table">
         <tbody><tr>
             <th colspan="2"><?=$mail?>'s Account Details</th>
         </tr>
@@ -78,4 +78,4 @@
         <tr><td colspan="2"><input name="detailupdate" type="submit" value="<?=_Update?>"/></td></tr>
     </tbody>
 </table>
-<br/>
\ No newline at end of file
+<br/>
diff --git a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.templ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.templ
index 84cb85e2..879367f9 100644
--- a/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.templ
+++ b/src/org/cacert/gigi/pages/admin/support/SupportUserDetailsPage.templ
@@ -1,6 +1,5 @@
-<br/>
 <?=$details?>
-<table class="wrapper dataTable centertext">
+<table class="table">
         <tbody><tr>
             <th><?=_Alternate Verified Email Addresses?></th>
         </tr>
@@ -11,5 +10,4 @@
         <? } ?>
         </tbody>
 </table>
-<br/>
-<?=$certifrevoke?>
\ No newline at end of file
+<?=$certifrevoke?>
diff --git a/src/org/cacert/gigi/pages/main/Signup.templ b/src/org/cacert/gigi/pages/main/Signup.templ
index d38cefc9..4464e98b 100644
--- a/src/org/cacert/gigi/pages/main/Signup.templ
+++ b/src/org/cacert/gigi/pages/main/Signup.templ
@@ -1,4 +1,4 @@
-<table class="wrapper dataTable" width="400">
+<table class="table">
   <thead>
   <tr>
     <th colspan="3"><?=_My Details?></th>
@@ -6,13 +6,13 @@
   </thead>
   <tbody>
   <tr>
-    <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>
+    <td><?=_First Name?>: </td>
+    <td><input type="text" name="fname" size="30" value="<?=$fname?>" autocomplete="off"></td>
+    <td rowspan="4"><?=$!helpOnNames?></td>
   </tr>
 
   <tr>
-    <td valign="top"><?=_Middle Name(s)?><br>
+    <td><?=_Middle Name(s)?><br>
       (<?=_optional?>)
     </td>
     <td><input type="text" name="mname" size="30" value="<?=$mname?>" autocomplete="off"></td>
diff --git a/src/org/cacert/gigi/pages/orga/AffiliationForm.templ b/src/org/cacert/gigi/pages/orga/AffiliationForm.templ
index 9cda4d85..584a3944 100644
--- a/src/org/cacert/gigi/pages/orga/AffiliationForm.templ
+++ b/src/org/cacert/gigi/pages/orga/AffiliationForm.templ
@@ -1,4 +1,4 @@
-<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper dataTable">
+<table class="table">
   <tr>
     <th><?=_Name?></th>
     <th><?=_Email?></th>
diff --git a/src/org/cacert/gigi/pages/orga/CreateOrgForm.templ b/src/org/cacert/gigi/pages/orga/CreateOrgForm.templ
index fc94fe3a..88108761 100644
--- a/src/org/cacert/gigi/pages/orga/CreateOrgForm.templ
+++ b/src/org/cacert/gigi/pages/orga/CreateOrgForm.templ
@@ -1,4 +1,4 @@
-<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper dataTable">
+<table class="table">
   <tr>
     <th colspan="2">
     <? if($edit) { ?>
diff --git a/src/org/cacert/gigi/pages/orga/OrgDomainAddForm.templ b/src/org/cacert/gigi/pages/orga/OrgDomainAddForm.templ
index c9f70b4e..3dc10d4c 100644
--- a/src/org/cacert/gigi/pages/orga/OrgDomainAddForm.templ
+++ b/src/org/cacert/gigi/pages/orga/OrgDomainAddForm.templ
@@ -1,4 +1,4 @@
-<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper dataTable">
+<table class="table">
   <tr>
     <th><?=_Domain Name?></td>
     <td><input type="text" name="domain"></td>
diff --git a/src/org/cacert/gigi/pages/orga/ViewOrgs.templ b/src/org/cacert/gigi/pages/orga/ViewOrgs.templ
index 2b22950d..e7465aa7 100644
--- a/src/org/cacert/gigi/pages/orga/ViewOrgs.templ
+++ b/src/org/cacert/gigi/pages/orga/ViewOrgs.templ
@@ -1,4 +1,4 @@
-<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper dataTable">
+<table class="table">
 <? foreach($orgas) { ?>
   <tr>
     <td><?=$country?></td>
diff --git a/src/org/cacert/gigi/pages/wot/AssuranceForm.templ b/src/org/cacert/gigi/pages/wot/AssuranceForm.templ
index 9b1aa2e5..3ace3b3a 100644
--- a/src/org/cacert/gigi/pages/wot/AssuranceForm.templ
+++ b/src/org/cacert/gigi/pages/wot/AssuranceForm.templ
@@ -1,4 +1,4 @@
-<table class="wrapper dataTable" width="600">
+<table class="table">
 <thead>
 <tr><th colspan="2"><?=_Assurance Confirmation?></th></tr>
 </thead>
diff --git a/src/org/cacert/gigi/pages/wot/AssureeSearch.templ b/src/org/cacert/gigi/pages/wot/AssureeSearch.templ
index acc04165..9101fe7f 100644
--- a/src/org/cacert/gigi/pages/wot/AssureeSearch.templ
+++ b/src/org/cacert/gigi/pages/wot/AssureeSearch.templ
@@ -1,5 +1,5 @@
 <form method="POST">
-<table class="wrapper dataTable" width="300">
+<table class="table">
   <thead>
   <tr>
     <th colspan="2" class="title"><?=_Assure Someone?></th>
@@ -7,13 +7,13 @@
   </thead>
   <tbody>
   <tr>
-    <td width="125"><?=_Email?>: </td>
-    <td width="125"><input type="text" name="email"></td>
+    <td><?=_Email?>: </td>
+    <td><input type="text" name="email"></td>
   </tr>
   <tr>
-    <td width="125"><?=_Date of Birth?><br>
+    <td><?=_Date of Birth?><br>
 	    (<?=_yyyy-mm-dd?>)</td>
-    <td width="125"><?=$DoB?></td>
+    <td><?=$DoB?></td>
   </tr>
   <tr>
     <td colspan="2"><input type="submit" name="search" value="<?=_Next?>"></td>
diff --git a/src/org/cacert/gigi/pages/wot/MyListingForm.templ b/src/org/cacert/gigi/pages/wot/MyListingForm.templ
index 1eed71ea..b1570086 100644
--- a/src/org/cacert/gigi/pages/wot/MyListingForm.templ
+++ b/src/org/cacert/gigi/pages/wot/MyListingForm.templ
@@ -1,4 +1,4 @@
-<table class="wrapper dataTable">
+<table class="table">
   <tr>
     <th colspan="2"><?=_My Listing?></td>
   </tr>
diff --git a/src/org/cacert/gigi/pages/wot/RequestTTPForm.templ b/src/org/cacert/gigi/pages/wot/RequestTTPForm.templ
index 6f8ff66b..01cedb86 100644
--- a/src/org/cacert/gigi/pages/wot/RequestTTPForm.templ
+++ b/src/org/cacert/gigi/pages/wot/RequestTTPForm.templ
@@ -1,4 +1,4 @@
-<table align="center" valign="middle" border="0" cellspacing="0" cellpadding="0" class="wrapper dataTable">
+<table class="table">
 	<tr>
 		<td class="DataTD"><?=_Country where you want to visit the TTP?></td>
 		<td class="DataTD"><select size="1" name="country">
diff --git a/util-testing/org/cacert/gigi/pages/Manager.templ b/util-testing/org/cacert/gigi/pages/Manager.templ
index 2efd14ad..69349366 100644
--- a/util-testing/org/cacert/gigi/pages/Manager.templ
+++ b/util-testing/org/cacert/gigi/pages/Manager.templ
@@ -1,5 +1,5 @@
 <form method='post'>
-<table>
+<table class="table">
 <tr><td>
 Batch create users:
 </td><td></td><td>
@@ -88,4 +88,4 @@ Domain: <input type="text" name="exemtDom"/>
 <input type="submit" value="Add a domain from exemption" name="addExDom"/>
 <input type="submit" value="Remove a domain from exemption" name="delExDom"/>
 </td></tr>
-</table>
\ No newline at end of file
+</table>
-- 
2.39.2