From f888ca824d26978e9224ac4899186010b67c88ec Mon Sep 17 00:00:00 2001
From: Michael M Slusarz <slusarz@curecanti.org>
Date: Thu, 3 Dec 2009 13:36:37 -0700
Subject: [PATCH] no valign attributes; nowrap is now handled via CSS.

---
 imp/templates/acl/acl.html          | 6 +++---
 imp/templates/compose/compose.html  | 6 +++---
 imp/templates/compose/redirect.html | 2 +-
 imp/templates/message/message.html  | 2 +-
 imp/templates/pgp/import_key.html   | 4 ++--
 imp/templates/smime/import_key.html | 4 ++--
 imp/templates/thread/thread.html    | 8 ++++----
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/imp/templates/acl/acl.html b/imp/templates/acl/acl.html
index fcbae3331..92d9927b6 100644
--- a/imp/templates/acl/acl.html
+++ b/imp/templates/acl/acl.html
@@ -31,7 +31,7 @@
   <td class="item leftAlign">&nbsp;</td>
  </tr>
  <tr>
-  <td colspan="<tag:maxrule />" class="header" valign="middle">
+  <td colspan="<tag:maxrule />" class="header">
    <input type="button" class="button" name="back" onclick="$('acl').disable(); document.location.href='<tag:prefsurl />'" value="<gettext>Return to Options</gettext>" />
   </td>
   <td class="header">&nbsp;</td>
@@ -75,7 +75,7 @@
  <td>&nbsp;</td>
 </tr>
 <tr>
- <td colspan = "<tag:maxrule />" class="header" valign="middle">
+ <td colspan="<tag:maxrule />" class="header">
   <input type="button" class="button" id="fbutton" name="fbutton" onclick="$('acl').submit(); $('acl').disable();" value="<gettext>Save</gettext>" />
   <input type="button" class="button" id="resetbut" name="resetbut" value="<gettext>Reset</gettext>" />
   <input type="button" class="button" id="back" name="back" onclick="$('acl').disable(); document.location.href='<tag:prefsurl />'" value="<gettext>Return to Options</gettext>" />
@@ -91,7 +91,7 @@
 </tr>
 
 <tr>
- <td colspan="<tag:maxrule />" class="header" valign="middle">
+ <td colspan="<tag:maxrule />" class="header">
   <input type="button" class="button" name="back" onclick="$('acl').disable(); document.location.href='<tag:prefsurl />'" value="<gettext>Return to Options</gettext>" />
  </td>
  <td class="header">&nbsp;</td>
diff --git a/imp/templates/compose/compose.html b/imp/templates/compose/compose.html
index 9a5516f19..cc0bc028c 100644
--- a/imp/templates/compose/compose.html
+++ b/imp/templates/compose/compose.html
@@ -124,7 +124,7 @@
 
 <if:stationery>
  <tr>
-  <td class="light rightAlign" valign="middle"><strong><tag:stationery_label />&nbsp;</strong></td>
+  <td class="light rightAlign"><strong><tag:stationery_label />&nbsp;</strong></td>
   <td class="item">
    <select name="stationery" id="stationery">
     <option value=""><gettext>Select stationery:</gettext></option>
@@ -187,7 +187,7 @@
 </if:compose_html>
 
  <tr>
-  <td class="light rightAlign" valign="top"><strong><tag:message_label />&nbsp;</strong></td>
+  <td class="light rightAlign"><strong><tag:message_label />&nbsp;</strong></td>
   <td class="item" id="composeMessageParent">
    <textarea class="fixed composebody" tabindex="<tag:message_tabindex />" name="message" id="composeMessage" rows="20" cols="80"><tag:message /></textarea>
   </td>
@@ -313,7 +313,7 @@
   <td style="padding-left:30px">
    <table>
     <tr>
-     <td class="rightAlign" valign="middle"><strong><label for="file_description_<tag:atc.number />"><gettext>Description:</gettext></label></strong>&nbsp;</td>
+     <td class="rightAlign"><strong><label for="file_description_<tag:atc.number />"><gettext>Description:</gettext></label></strong>&nbsp;</td>
      <td><input type="text" size="40" id="file_description_<tag:atc.number />" name="file_description_<tag:atc.number />" value="<tag:atc.description />" /></td>
     </tr>
     <tr>
diff --git a/imp/templates/compose/redirect.html b/imp/templates/compose/redirect.html
index 2e3aad1b0..845ff3bca 100644
--- a/imp/templates/compose/redirect.html
+++ b/imp/templates/compose/redirect.html
@@ -25,7 +25,7 @@
 </if:has_search>
 
  <tr>
-  <td class="light rightAlign" valign="middle"><strong><tag:to />&nbsp;</strong></td>
+  <td class="light rightAlign"><strong><tag:to />&nbsp;</strong></td>
   <td class="item leftAlign">
    <table border="0" width="100%" cellpadding="0">
 <if:multiple_to>
diff --git a/imp/templates/message/message.html b/imp/templates/message/message.html
index 5a8aef7f6..9ee0597e1 100644
--- a/imp/templates/message/message.html
+++ b/imp/templates/message/message.html
@@ -2,7 +2,7 @@
  <table cellspacing="0">
 <loop:headers>
   <tr<if:headers.class> class="<tag:headers.class />"</if:headers.class>>
-   <td class="item<tag:headers.i /> rightAlign nowrap" valign="top"><strong><tag:headers.name />:</strong>&nbsp;</td>
+   <td class="item<tag:headers.i /> rightAlign nowrap"><strong><tag:headers.name />:</strong>&nbsp;</td>
    <td class="item<tag:headers.i /> msgheader"><tag:headers.val /></td>
   </tr>
 </loop:headers>
diff --git a/imp/templates/pgp/import_key.html b/imp/templates/pgp/import_key.html
index ad6054fbf..823311590 100644
--- a/imp/templates/pgp/import_key.html
+++ b/imp/templates/pgp/import_key.html
@@ -8,7 +8,7 @@
 
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
  <tr>
-  <td class="header leftAlign" nowrap="nowrap"><if:import_public_key><gettext>Import Public PGP Key</gettext></if:import_public_key><if:import_personal_public_key><gettext>Import Personal Public PGP Key</gettext></if:import_personal_public_key><if:import_personal_private_key><gettext>Import Personal Private PGP Key</gettext></if:import_personal_private_key></td>
+  <td class="header leftAlign nowrap"><if:import_public_key><gettext>Import Public PGP Key</gettext></if:import_public_key><if:import_personal_public_key><gettext>Import Personal Public PGP Key</gettext></if:import_personal_public_key><if:import_personal_private_key><gettext>Import Personal Private PGP Key</gettext></if:import_personal_private_key></td>
  </tr>
 
  <tr>
@@ -44,7 +44,7 @@
  </tr>
 
  <tr>
-  <td nowrap="nowrap" align="center" class="header" valign="middle">
+  <td align="center" class="header nowrap">
    <input type="submit" name="import" class="button" value="<gettext>Import Key</gettext>" />
    <input type="submit" name="import" class="button" onclick="window.close();" value="<gettext>Cancel</gettext>" />
   </td>
diff --git a/imp/templates/smime/import_key.html b/imp/templates/smime/import_key.html
index 194775ec9..cdd7b1fc9 100644
--- a/imp/templates/smime/import_key.html
+++ b/imp/templates/smime/import_key.html
@@ -8,7 +8,7 @@
 
 <table cellspacing="0" width="100%">
  <tr>
-  <td class="header leftAlign" nowrap="nowrap"<if:import_personal_certs> colspan="2"</if:import_personal_certs>><if:import_public_key><gettext>Import Public S/MIME Key</gettext></if:import_public_key><if:import_personal_certs><gettext>Import Personal S/MIME Certificates</gettext></if:import_personal_certs></td>
+  <td class="header leftAlign nowrap"<if:import_personal_certs> colspan="2"</if:import_personal_certs>><if:import_public_key><gettext>Import Public S/MIME Key</gettext></if:import_public_key><if:import_personal_certs><gettext>Import Personal S/MIME Certificates</gettext></if:import_personal_certs></td>
  </tr>
 
 <if:import_public_key>
@@ -65,7 +65,7 @@
 </if:import_personal_certs>
 
  <tr>
-  <td nowrap="nowrap" align="center" class="header" valign="middle">
+  <td align="center" class="header nowrap">
    <input type="submit" name="import" class="button" value="<gettext>Import Key</gettext>" />
    <input type="submit" name="import" class="button" onclick="window.close();" value="<gettext>Cancel</gettext>" />
   </td>
diff --git a/imp/templates/thread/thread.html b/imp/templates/thread/thread.html
index 7955756f0..0944c3daf 100644
--- a/imp/templates/thread/thread.html
+++ b/imp/templates/thread/thread.html
@@ -19,21 +19,21 @@
   <td class="item">
   <a id="i<tag:messages.idx />"></a>
    <table width="100%">
-    <tr valign="top">
+    <tr>
      <td class="item">
       <table class="multipleMsgs" width="100%" cellpadding="2" cellspacing="0">
        <tr>
-        <td class="item0 rightAlign" valign="top" nowrap="nowrap"><strong><gettext>Date:</gettext></strong>&nbsp;</td>
+        <td class="item0 rightAlign nowrap"><strong><gettext>Date:</gettext></strong>&nbsp;</td>
         <td class="item0 msgheader leftAlign"><tag:messages.date /></td>
         <td class="item0 rightAlign"><tag:messages.link /></td>
        </tr>
        <tr>
-        <td class="item1 rightAlign" valign="top" nowrap="nowrap"><strong><if:messages.addr_to><gettext>To:</gettext><else:messages.addr_to><gettext>From:</gettext></else:messages.addr_to></if:messages.addr_to></strong>&nbsp;</td>
+        <td class="item1 rightAlign nowrap"><strong><if:messages.addr_to><gettext>To:</gettext><else:messages.addr_to><gettext>From:</gettext></else:messages.addr_to></if:messages.addr_to></strong>&nbsp;</td>
         <td class="item1 msgheader leftAlign" width="100%" colspan="2"><tag:messages.addr /></td>
        </tr>
 <if:messages.subject>
        <tr>
-        <td class="item0 rightAlign" valign="top" nowrap="nowrap"><strong><gettext>Subject:</gettext></strong>&nbsp;</td>
+        <td class="item0 rightAlign nowrap"><strong><gettext>Subject:</gettext></strong>&nbsp;</td>
         <td class="item0 msgheader leftAlign" width="100%" colspan="2"><tag:messages.subject /></td>
        </tr>
 </if:messages.subject>
-- 
2.11.0