diff -ur horde-orig/imp/templates/acl/acl.inc horde-changed/imp/templates/acl/acl.inc
--- horde-orig/imp/templates/acl/acl.inc	2005-03-21 07:31:00.000000000 +0330
+++ horde-changed/imp/templates/acl/acl.inc	2005-05-03 13:37:02.000000000 +0430
@@ -103,16 +103,16 @@
   <?php Util::pformInput() ?>
 <?php if (!count($curr_acl)): ?>
   <tr>
-    <td colspan="2" class="item" align="left">
+    <td colspan="2" class="item leftAlign">
       <em><strong>&nbsp;<?php echo _("The current list of users with access to this folder could not be retrieved") ?></strong></em>
     </td>
   </tr>
 <?php else: ?>
 <?php $i = 1; foreach ($curr_acl as $index => $rule): ?>
   <tr>
-    <td class="light" align="right">
+    <td class="light rightAlign">
       <strong><?php echo $i++ ?>&nbsp;</strong>
-    </td><td class="item" align="left">
+    </td><td class="item leftAlign">
       <input class="item" type="radio" name="number" value="<?php echo $i-2 ?>" <?php if (in_array($index, $protected)) echo 'disabled ' ?>onclick="selectRule(<?php echo $i - 2 ?>)" />&nbsp;&nbsp;
       <strong><?php echo $index ?></strong>&nbsp;&nbsp;
     <?php foreach ($rule as $key => $val): ?><?php echo $key ?>,&nbsp;<?php endforeach; ?>
@@ -120,9 +120,9 @@
   </tr>
 <?php endforeach; ?>
   <tr>
-    <td class="light" align="right">
+    <td class="light rightAlign">
       <strong><?php echo _("New") ?>&nbsp;</strong>
-    </td><td class="item" align="left">
+    </td><td class="item leftAlign">
       <input class="item" type="radio" checked name="number" value="<?php echo $i - 1 ?>" onclick="selectRule(<?php echo $i - 1 ?>)" />&nbsp;&nbsp;
     </td>
   </tr>
@@ -138,17 +138,17 @@
 
 <?php if ($canEdit): ?>
   <tr>
-    <td class="light" align="right">
+    <td class="light rightAlign">
       <strong><?php echo _("User") ?>&nbsp;</strong>
-    </td><td class="item" align="left">
+    </td><td class="item leftAlign">
       &nbsp;<input class="fixed" type="text" name="share_user" />
     </td>
   </tr>
 <?php foreach ($rights as $right => $desc): ?>
   <tr>
-    <td class="light" align="right">
+    <td class="light rightAlign">
       <strong><?php echo $right ?>&nbsp;:&nbsp;</strong>
-    </td><td class="item" align="left">
+    </td><td class="item leftAlign">
       <input type="checkbox" name="acl[<?php echo $right ?>]" />
     &nbsp;<?php echo $desc ?>
     </td>
@@ -165,7 +165,7 @@
 
 <?php else: ?>
   <tr>
-    <td colspan="2" class="item" align="left">
+    <td colspan="2" class="item leftAlign">
       <em><strong>&nbsp;<?php echo _("You do not have permission to change access to this folder") ?></strong></em>
     </td>
   </tr><tr>
diff -ur horde-orig/imp/templates/mailbox/actions_deleted.inc horde-changed/imp/templates/mailbox/actions_deleted.inc
--- horde-orig/imp/templates/mailbox/actions_deleted.inc	2004-12-02 18:11:01.000000000 +0330
+++ horde-changed/imp/templates/mailbox/actions_deleted.inc	2005-05-03 14:15:32.000000000 +0430
@@ -3,7 +3,7 @@
   <td class="control" colspan="6">
    <table width="100%">
     <tr>
-     <td align="right">
+     <td class="rightAlign">
       <?php echo Horde::widget(Util::addParameter($mailbox_link, 'actionID', 'hide_deleted'), $deleted_prompt, 'widget', '', '', $deleted_prompt); ?> |
       <?php echo Horde::widget(Util::addParameter($mailbox_link, 'actionID', 'expunge_mailbox'), _("Purge Deleted"), 'widget', '', '', _("Pur_ge Deleted")); ?>
      </td>
diff -ur horde-orig/imp/templates/mailbox/actions.inc horde-changed/imp/templates/mailbox/actions.inc
--- horde-orig/imp/templates/mailbox/actions.inc	2004-04-09 20:01:10.000000000 +0430
+++ horde-changed/imp/templates/mailbox/actions.inc	2005-05-03 11:08:40.000000000 +0430
@@ -3,7 +3,7 @@
 
 <table border="0" width="100%">
 <tr>
-    <td align="left">
+    <td class="leftAlign">
 <?php if ($trashMbox): ?>
         <?php echo Horde::widget('', _("Delete"), 'widget', '', "if (confirm('" . addslashes(_("Are you sure you wish to permanently delete these messages?")) . "')) { Submit('delete_messages'); } return false;", _("_Delete")); ?>
 <?php else: ?>
@@ -27,7 +27,7 @@
 <?php endif; ?>
 <?php endif; ?>
     </td>
-    <td align="right">
+    <td class="rightAlign">
 <?php if ($showdelete): ?>
 <?php $mailbox_link = Util::addParameter($mailbox_url, 'page', $pageOb->page); ?>
 <?php if (!$prefs->isLocked('delhide')): ?>
diff -ur horde-orig/imp/templates/mailbox/header.inc horde-changed/imp/templates/mailbox/header.inc
--- horde-orig/imp/templates/mailbox/header.inc	2005-04-29 07:03:57.000000000 +0430
+++ horde-changed/imp/templates/mailbox/header.inc	2005-05-04 10:42:16.000000000 +0430
@@ -1,5 +1,5 @@
 <div class="header">
- <span style="float:left; width:40%">
+ <span style="width:40%" class="leftFloat">
   <?php echo htmlspecialchars($title) ?>
   <?php echo Horde::link($refresh_url, $refresh_title, 'smallheader', '', '', $refresh_title, $refresh_ak) . Horde::img('reload.png', _("Reload"), array('title' => $refresh_title, 'align' => 'absmiddle'), $registry->getImageDir('horde')) ?></a>
 
@@ -15,14 +15,14 @@
  </span>
 
 <?php if ($pageOb->pagecount > 1): ?>
- <span style="float:left; width:30%; text-align:left">
+ <span style="width:30%" class="leftFloat leftAlign">
   <?php echo sprintf(_("Page %d of %d"), $pageOb->page, $pageOb->pagecount) ?>
  </span>
- <span style="float:right; width:30%; text-align:right">
+ <span style="width:30%" class="rightFloat rightAlign">
   <?php echo $msg_count ?>
  </span>
 <?php else: ?>
- <span style="float:right; width:60%; text-align:right">
+ <span style="width:60%" class="rightFloat rightAlign">
   <?php echo $msg_count ?>
  </span>
 <?php endif; ?>
diff -ur horde-orig/imp/templates/mailbox/mailbox.html horde-changed/imp/templates/mailbox/mailbox.html
--- horde-orig/imp/templates/mailbox/mailbox.html	2005-01-04 01:49:24.000000000 +0330
+++ horde-changed/imp/templates/mailbox/mailbox.html	2005-05-03 14:20:02.000000000 +0430
@@ -9,6 +9,6 @@
   <td><tag:overflow_begin /><tag:messages.date />&nbsp;<tag:overflow_end /></td>
   <td><tag:overflow_begin /><tag:messages.from />&nbsp;<tag:overflow_end /></td>
   <td><tag:overflow_begin /><tag:messages.subject /><tag:overflow_end /></td>
-  <td align="right"><tag:overflow_begin /><tag:messages.size /><tag:overflow_end /></td>
+  <td class="rightAlign"><tag:overflow_begin /><tag:messages.size /><tag:overflow_end /></td>
  </tr>
 </loop:messages>
diff -ur horde-orig/imp/templates/mailbox/navbar.inc horde-changed/imp/templates/mailbox/navbar.inc
--- horde-orig/imp/templates/mailbox/navbar.inc	2003-09-17 03:35:20.000000000 +0430
+++ horde-changed/imp/templates/mailbox/navbar.inc	2005-05-03 14:20:51.000000000 +0430
@@ -3,7 +3,7 @@
 
 <table border="0" width="100%">
 <tr>
-  <td align="left" nowrap="nowrap" width="20%">
+  <td class="leftAlign" nowrap="nowrap" width="20%">
     <form name="select<?php echo $navform ?>" action="javascript:void(0)" onsubmit="return false">
     <select name="filter" onchange="makeSelection(<?php echo $navform ?>);">
       <option value="" selected="selected"><?php echo _("Select") ?>:</option>
@@ -44,7 +44,7 @@
 <?php endif; ?>
     </form>
   </td>
-  <td align="left" nowrap="nowrap" width="30%">
+  <td class="leftAlign" nowrap="nowrap" width="30%">
     <?php if ($conf['user']['allow_folders']): ?>
     <form method="post" name="copymove<?php echo $navform ?>" action="<?php echo Horde::applicationUrl('mailbox.php') ?>">
     <?php echo Horde::link('', _("Move"), 'widget', '', "Transfer('move_messages', $navform); return false;") . _("Move") ?></a> |
@@ -56,7 +56,7 @@
     <?php endif; ?>
   </td>
 
-  <td width="50%" align="right" nowrap="nowrap">
+  <td width="50%" class="rightAlign" nowrap="nowrap">
     <?php if ($pageOb->pagecount > 1): ?>
     <form method="get" name="pagenav<?php echo $navform ?>" action="<?php echo Horde::applicationUrl('mailbox.php') ?>">
     <?php Util::pformInput() ?>
diff -ur horde-orig/imp/templates/menu.inc horde-changed/imp/templates/menu.inc
--- horde-orig/imp/templates/menu.inc	2005-04-14 04:51:37.000000000 +0430
+++ horde-changed/imp/templates/menu.inc	2005-05-03 16:11:04.000000000 +0430
@@ -11,7 +11,7 @@
 ?>
 <div id="menu">
 <?php if ($conf['user']['allow_folders']): ?>
- <span style="float:right">
+ <span class="rightFloat">
   <form action="mailbox.php" method="get" name="menu">
    <?php Util::pformInput() ?>
    <input type="hidden" name="no_newmail_popup" value="1" />
@@ -22,7 +22,7 @@
    </label>
   </form>
  </span>
- <span style="float:right">
+ <span class="rightFloat">
   <?php
    $link = Horde::link('#', _("Open Folder"), '', '', 'folderSubmit(true); return false;');
    printf('<ul><li>%s%s<br />%s</a></li></ul>',
diff -ur horde-orig/imp/templates/message/headers.inc horde-changed/imp/templates/message/headers.inc
--- horde-orig/imp/templates/message/headers.inc	2005-03-20 16:17:20.000000000 +0330
+++ horde-changed/imp/templates/message/headers.inc	2005-05-03 15:45:55.000000000 +0430
@@ -3,7 +3,7 @@
 <?php if ($all_headers): ?>
   <?php foreach ($full_h as $head => $val): ?><tr>
   <?php if (in_array($head, $basic_headers)) $val = $imp_headers->getValue($head); ?>
-  <td class="item<?php echo $i ?>" align="right" valign="top" nowrap="nowrap"><strong><?php echo $head ?>:</strong>&nbsp;</td>
+  <td class="item<?php echo $i ?> rightAlign" valign="top" nowrap="nowrap"><strong><?php echo $head ?>:</strong>&nbsp;</td>
   <td class="item<?php echo $i ?>" width="100%"><?php echo $val ?></td>
 </tr><?php $i = ($i + 1) % 2; ?>
   <?php endforeach; ?>
@@ -11,7 +11,7 @@
   <?php foreach ($basic_headers as $head => $str): ?>
     <?php if ($val = $imp_headers->getValue($head)): ?>
 <tr>
-  <td class="item<?php echo $i ?>" nowrap="nowrap" align="right" valign="top"><strong><?php echo $str ?>:</strong>&nbsp;</td>
+  <td class="item<?php echo $i ?> rightAlign" nowrap="nowrap" valign="top"><strong><?php echo $str ?>:</strong>&nbsp;</td>
   <td class="item<?php echo $i ?>" width="100%"><?php echo $val ?></td>
 </tr>
     <?php $i = ($i + 1) % 2; endif; ?>
@@ -19,7 +19,7 @@
 <?php endif; ?>
 <?php if (!empty($user_hdrs) && count($custom_hdrs) > 0): ?>
   <?php foreach ($custom_hdrs as $head => $val): ?><tr>
-  <td class="item<?php echo $i ?>" align="right" valign="top" nowrap="nowrap"><strong><?php echo $head ?>:</strong>&nbsp;</td>
+  <td class="item<?php echo $i ?> rightAlign" valign="top" nowrap="nowrap"><strong><?php echo $head ?>:</strong>&nbsp;</td>
   <td class="item<?php echo $i ?>" width="100%"><?php echo $val ?></td>
 </tr><?php $i = ($i + 1) % 2; ?>
   <?php endforeach; ?>
@@ -28,26 +28,26 @@
   <?php foreach ($imp_headers->listHeaders() as $head => $str): ?>
     <?php if ($val = $imp_headers->getValue($head)): ?>
 <tr>
-  <td class="item<?php echo $i ?>" align="right" nowrap="nowrap" valign="top"><strong><?php echo $str ?>:</strong>&nbsp;</td>
+  <td class="item<?php echo $i ?> rightAlign" nowrap="nowrap" valign="top"><strong><?php echo $str ?>:</strong>&nbsp;</td>
   <td class="item<?php echo $i ?>" width="100%"><?php echo $val ?></td>
 </tr>
     <?php $i = ($i + 1) % 2; endif; ?>
   <?php endforeach; ?>
 <?php endif; ?>
 <?php if ($val = $imp_headers->getValue('priority')): ?><tr>
-  <td class="item<?php echo $i ?>" align="right" valign="top"><strong><?php echo _("Priority") ?>:</strong>&nbsp;</td>
+  <td class="item<?php echo $i ?> rightAlign" valign="top"><strong><?php echo _("Priority") ?>:</strong>&nbsp;</td>
   <td class="item<?php echo $i ?>" width="100%"><?php echo $val ?></td>
 </tr><?php $i = ($i + 1) % 2; endif; ?>
 <?php if ($show_parts || ($downloadall_link && !$printer_friendly)): ?>
 <tr>
-  <td class="item<?php echo $i ?>" align="right" valign="top"><strong><?php echo _("Part(s)") ?>:</strong>&nbsp;</td>
+  <td class="item<?php echo $i ?> rightAlign" valign="top"><strong><?php echo _("Part(s)") ?>:</strong>&nbsp;</td>
 <?php if ($show_parts): ?>
   <td class="item<?php echo $i ?>" width="100%"><table cellspacing="2" cellpadding="1"><?php echo $attachments ?></table></td>
 <?php endif; ?>
 <?php if ($downloadall_link && !$printer_friendly): ?>
 <?php if ($show_parts): ?>
 <tr>
-  <td class="item<?php echo $i ?>" align="right" valign="top"></td>
+  <td class="item<?php echo $i ?> rightAlign" valign="top"></td>
 <?php endif; ?>
   <td class="item<?php echo $i ?>" width="100%"><?php echo Horde::link($downloadall_link, _("Download All Attachments (in .zip file)")) . _("Download All Attachments (in .zip file)") . ' ' . Horde::img('compressed.png', _("Download All Attachments (in .zip file)"), array('align' => 'middle'), $registry->getImageDir('horde') . '/mime') ?></a></td>
 <?php endif; ?>
@@ -55,7 +55,7 @@
 <?php $i = ($i + 1) % 2; endif; ?>
 <?php if (!$printer_friendly): ?>
 <tr>
-  <td class="item<?php echo $i ?>" align="right" valign="top"><strong><?php echo _("Headers") ?>:</strong>&nbsp;</td>
+  <td class="item<?php echo $i ?> rightAlign" valign="top"><strong><?php echo _("Headers") ?>:</strong>&nbsp;</td>
   <td class="item<?php echo $i ?>" width="100%">
     <?php if ($all_headers || $list_headers): ?>
       <?php echo Horde::link($headersURL, _("Show Limited Headers")) . _("Show Limited Headers") ?></a>
diff -ur horde-orig/imp/templates/message/navbar_actions.inc horde-changed/imp/templates/message/navbar_actions.inc
--- horde-orig/imp/templates/message/navbar_actions.inc	2005-03-23 09:43:26.000000000 +0430
+++ horde-changed/imp/templates/message/navbar_actions.inc	2005-05-04 10:42:47.000000000 +0430
@@ -1,5 +1,5 @@
 <tr>
-<td align="left" colspan="3" class="control">
+<td colspan="3" class="control leftAlign">
 <?php if ($imp_headers->getFlag('deleted')): ?>
 <?php echo Horde::widget(Util::addParameter($self_link, 'actionID', 'undelete_message'), _("Undelete"), 'widget', '', '', _("Undelete"), true) ?>
 <?php else: ?>
diff -ur horde-orig/imp/templates/message/navbar_navigate.inc horde-changed/imp/templates/message/navbar_navigate.inc
--- horde-orig/imp/templates/message/navbar_navigate.inc	2004-12-02 23:11:47.000000000 +0330
+++ horde-changed/imp/templates/message/navbar_navigate.inc	2005-05-03 16:13:13.000000000 +0430
@@ -1,5 +1,5 @@
 <tr class="control">
-  <td nowrap="nowrap" align="left">
+  <td nowrap="nowrap" class="leftAlign">
 <?php if ($imp['base_protocol'] != 'pop3'): ?>
     <select name="flag<?php echo $nav_id ?>" onchange="flagMessage(<?php echo $nav_id ?>);">
       <option value="" selected="selected"><?php echo _("Mark as:") ?></option>
@@ -13,7 +13,7 @@
     </select>
   </td>
 <?php endif; ?>
-  <td nowrap="nowrap" align="left">
+  <td nowrap="nowrap" class="leftAlign">
 <?php if ($conf['user']['allow_folders']): ?>
     <?php echo Horde::widget('', _("Move to folder"), 'widget', '', "Transfer('move_message'," . $nav_id . "); return false;", _("Move")) ?> |
     <?php echo Horde::widget('', _("Copy to folder"), 'widget', '', "Transfer('copy_message'," . $nav_id . "); return false;", _("Copy")) ?>
@@ -22,7 +22,7 @@
     </select>
 <?php endif; ?>
   </td>
-  <td width="65%" align="right" nowrap="nowrap">
+  <td width="65%" class="rightAlign" nowrap="nowrap">
     <?php echo Horde::widget($mailbox_url, sprintf(_("Back to %s"), $page_label), 'widget', '', '', sprintf(_("Bac_k to %s"), $page_label), true) ?>&nbsp;&nbsp;
 <?php if (!empty($prev_url)): ?>
     <?php echo Horde::link($prev_url, _("Previous Message"), '', '', '', '', '<', array('id' => 'prev')) . Horde::img('nav/left.png', '<', array('title' => _("Previous Message"), 'width' => '16', 'height' => '16', 'align' => 'middle'), $registry->getImageDir('horde')) ?></a>
diff -ur horde-orig/imp/templates/message/navbar_top.inc horde-changed/imp/templates/message/navbar_top.inc
--- horde-orig/imp/templates/message/navbar_top.inc	2005-03-16 21:14:12.000000000 +0330
+++ horde-changed/imp/templates/message/navbar_top.inc	2005-05-03 16:11:48.000000000 +0430
@@ -9,7 +9,7 @@
 
 <table border="0" cellpadding="0" cellspacing="0" align="center" width="100%">
  <tr>
-  <td align="left" class="header">
+  <td class="header leftAlign">
      <?php echo sprintf(_("%s: %s (%d&nbsp;of&nbsp;%d)"), htmlspecialchars($page_label), $shortsub, $msgindex, $msgcount); echo '&nbsp;&nbsp;' . $status ?>
   </td>
  </tr>
diff -ur horde-orig/imp/templates/pgp/passphrase.inc horde-changed/imp/templates/pgp/passphrase.inc
--- horde-orig/imp/templates/pgp/passphrase.inc	2005-03-20 16:17:20.000000000 +0330
+++ horde-changed/imp/templates/pgp/passphrase.inc	2005-05-03 16:14:13.000000000 +0430
@@ -12,10 +12,10 @@
   <td>
    <table width="100%" cellspacing="0" cellpadding="2">
     <tr>
-     <td class="smallheader" align="left">
+     <td class="smallheader leftAlign">
       <?php echo Horde::img('locked.png', _("PGP"), null, $registry->getImageDir('horde')) ?>
      </td>
-     <td class="smallheader" align="left">
+     <td class="smallheader leftAlign">
       <?php echo sprintf(_("Please enter the passphrase for your PGP private key. You will only need to enter this passphrase once per %s session."),
                          $registry->get('name')) ?>
      </td>
@@ -25,7 +25,7 @@
  </tr>
 
  <tr>
-  <td class="light" align="left">
+  <td class="light leftAlign">
    <strong><?php echo _("Passphrase:") ?></strong>&nbsp;
    <input type="password" name="passphrase" size="15" maxlength="60" class="fixed" />&nbsp;
    <input type="submit" name="submit" class="button" value="<?php echo _("Submit") ?>" />&nbsp;
diff -ur horde-orig/imp/templates/smime/passphrase.inc horde-changed/imp/templates/smime/passphrase.inc
--- horde-orig/imp/templates/smime/passphrase.inc	2005-03-21 07:30:28.000000000 +0330
+++ horde-changed/imp/templates/smime/passphrase.inc	2005-05-03 16:16:25.000000000 +0430
@@ -9,11 +9,11 @@
 
 <table border="0" cellspacing="0" cellpadding="2">
   <tr>
-    <td class="smallheader" align="left">
+    <td class="smallheader leftAlign">
       <?php echo sprintf(_("Please enter the passphrase for your S/MIME private key. You will only need to enter this passphrase once per %s session."), _("Mail")) ?>
     </td>
   </tr><tr>
-    <td class="light" align="left">
+    <td class="light leftAlign">
       <strong><?php echo _("Passphrase:") ?></strong>&nbsp;
       <input type="password" name="passphrase" size="15" maxlength="60" class="fixed" />&nbsp;
       <input type="submit" name="submit" class="button" value="<?php echo _("Submit") ?>" />&nbsp;
diff -ur horde-orig/imp/templates/thread/thread.html horde-changed/imp/templates/thread/thread.html
--- horde-orig/imp/templates/thread/thread.html	2005-03-21 05:42:33.000000000 +0330
+++ horde-changed/imp/templates/thread/thread.html	2005-05-03 15:48:03.000000000 +0430
@@ -24,13 +24,13 @@
      <td class="item">
       <table border="0" align="center" width="100%" cellpadding="2" cellspacing="0">
        <tr>
-        <td class="item0" align="right" valign="top" nowrap="nowrap"><strong><tag:date_string />:</strong>&nbsp;</td>
-        <td class="item0" align="left"><tag:messages.date /></td>
-        <td class="item0" align="right"><tag:messages.link /></td>
+        <td class="item0 rightAlign" valign="top" nowrap="nowrap"><strong><tag:date_string />:</strong>&nbsp;</td>
+        <td class="item0 leftAlign"><tag:messages.date /></td>
+        <td class="item0 rightAlign"><tag:messages.link /></td>
        </tr>
        <tr>
-        <td class="item1" align="right" valign="top" nowrap="nowrap"><strong><tag:from_string />:</strong>&nbsp;</td>
-        <td class="item1" align="left" width="100%" colspan="2"><tag:messages.from /></td>
+        <td class="item1 rightAlign" valign="top" nowrap="nowrap"><strong><tag:from_string />:</strong>&nbsp;</td>
+        <td class="item1 leftAlign" width="100%" colspan="2"><tag:messages.from /></td>
        </tr>
       </table>
 
diff -ur horde-orig/templates/admin/user/approve.inc horde-changed/templates/admin/user/approve.inc
--- horde-orig/templates/admin/user/approve.inc	2005-03-20 18:48:47.000000000 +0330
+++ horde-changed/templates/admin/user/approve.inc	2005-05-03 13:59:52.000000000 +0430
@@ -1,6 +1,6 @@
 <table border="0" cellspacing="0" cellpadding="1" width="100%">
 <tr>
-  <td align="left" class="header">
+  <td class="header leftAlign">
     <?php echo _("Pending Signups:") ?>
   </td>
 </tr>
@@ -16,7 +16,7 @@
     if (count($allQueued) == 0) {
 ?>
 <tr>
-  <td colspan="4" align="left"><?php echo _("No pending signups.") ?></td>
+  <td colspan="4" class="leftAlign"><?php echo _("No pending signups.") ?></td>
 </tr>
 <?php
     } else {
diff -ur horde-orig/templates/admin/user/clear.inc horde-changed/templates/admin/user/clear.inc
--- horde-orig/templates/admin/user/clear.inc	2005-03-20 18:48:47.000000000 +0330
+++ horde-changed/templates/admin/user/clear.inc	2005-05-03 13:56:45.000000000 +0430
@@ -3,7 +3,7 @@
 
 <table border="0" cellspacing="0" cellpadding="2">
   <tr>
-    <td align="left" class="header">
+    <td class="header leftAlign">
       <?php printf(_("Clear out user: %s"), $f_user_name) ?>
     </td>
   </tr><tr>
@@ -11,7 +11,7 @@
       <strong><?php printf(_("Really remove user data for user %s? This operation cannot be undone."), $f_user_name) ?></strong>
     </td>
   </tr><tr>
-    <td class="smallheader" align="right">
+    <td class="smallheader rightAlign">
         <input type="submit" class="button" name="submit" value="<?php echo _("Clear user") ?>" />
         <input type="submit" class="button" name="submit" value="<?php echo _("Cancel") ?>" />
     </td>
diff -ur horde-orig/templates/admin/user/list.inc horde-changed/templates/admin/user/list.inc
--- horde-orig/templates/admin/user/list.inc	2005-03-20 18:48:47.000000000 +0330
+++ horde-changed/templates/admin/user/list.inc	2005-05-03 13:57:52.000000000 +0430
@@ -1,6 +1,6 @@
 <table border="0" cellspacing="0" cellpadding="1" width="100%">
   <tr>
-    <td align="left" class="header">
+    <td class="header leftAlign">
       <?php echo _("Users in the system:") ?>
 <?php if ($numitem): ?>
       <span class="smallheader">[<?php echo sprintf(_("%s to %s of %s"), $start, $end, $numitem) ?>]</span>
@@ -36,7 +36,7 @@
 <?php endif; ?>
           <td width="1%"><?php echo Horde::link(Horde::applicationUrl('admin/user.php?form=update_f&user_name=' . $user), _("Update")) .  Horde::img('edit.png', _("Update")) ?></a></td>
           <td width="1%"><?php echo Horde::link(Horde::applicationUrl('admin/user.php?form=clear_f&user_name=' . $user), _("Clear user data")) .  Horde::img('reload.png', _("Clear user data")) ?></a></td>
-          <td align="left"><?php echo $user ?></td>
+          <td class="leftAlign"><?php echo $user ?></td>
         </tr>
 <?php
 endforeach;
diff -ur horde-orig/templates/admin/user/noadd.inc horde-changed/templates/admin/user/noadd.inc
--- horde-orig/templates/admin/user/noadd.inc	2005-03-20 18:48:47.000000000 +0330
+++ horde-changed/templates/admin/user/noadd.inc	2005-05-03 14:00:18.000000000 +0430
@@ -1,10 +1,10 @@
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
   <tr>
-    <td align="left" class="header">
+    <td class="header leftAlign">
       <?php echo _("Adding users is disabled.") ?>
     </td>
   </tr><tr>
-    <td align="left" class="control">
+    <td class="control leftAlign">
       <?php echo _("Your authentication backend does not support adding users, or the feature has been disabled for some other reason.") ?>
     </td>
   </tr>
diff -ur horde-orig/templates/admin/user/nolist.inc horde-changed/templates/admin/user/nolist.inc
--- horde-orig/templates/admin/user/nolist.inc	2005-03-20 18:48:47.000000000 +0330
+++ horde-changed/templates/admin/user/nolist.inc	2005-05-03 13:58:27.000000000 +0430
@@ -1,10 +1,10 @@
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
   <tr>
-    <td align="left" class="header">
+    <td class="header leftAlign">
       <?php echo _("Listing users is disabled.") ?>
     </td>
   </tr><tr>
-    <td align="left" class="control">
+    <td class="control leftAlign">
       <?php echo _("Your authentication backend does not support listing users, or the feature has been disabled for some other reason.") ?>
     </td>
   </tr>
diff -ur horde-orig/templates/admin/user/update.inc horde-changed/templates/admin/user/update.inc
--- horde-orig/templates/admin/user/update.inc	2005-03-20 18:48:47.000000000 +0330
+++ horde-changed/templates/admin/user/update.inc	2005-05-03 14:02:34.000000000 +0430
@@ -27,25 +27,25 @@
 <input type="hidden" name="user_name" value="<?php echo htmlspecialchars($f_user_name) ?>" />
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
   <tr>
-    <td align="left" class="header" colspan="2">
+    <td class="header leftAlign" colspan="2">
       <?php printf(_("Update %s"), $f_user_name) ?>
     </td>
   </tr>
 <?php if ($auth->hasCapability('update')): ?>
   <tr>
-    <td width="1%" nowrap="nowrap" align="right" class="light">
+    <td width="1%" nowrap="nowrap" class="light rightAlign">
       <?php echo _("New Username (optional)") ?>
     </td><td class="item0">
       <input type="text" name="user_name2" value="<?php echo htmlspecialchars($f_user_name) ?>" />
     </td>
   </tr><tr>
-    <td nowrap="nowrap" align="right" class="light">
+    <td nowrap="nowrap" class="light rightAlign">
       <?php echo _("Password") ?>
     </td><td class="item1">
       <input type="password" name="user_pass_1" />
     </td>
   </tr><tr>
-    <td nowrap="nowrap" align="right" class="light">
+    <td nowrap="nowrap" class="light rightAlign">
       <?php echo _("Confirm Password") ?>
     </td><td class="item0">
       <input type="password" name="user_pass_2" />
@@ -53,19 +53,19 @@
   </tr>
 <?php endif; ?>
   <tr>
-    <td nowrap="nowrap" align="right" class="light">
+    <td nowrap="nowrap" class="light rightAlign">
       <?php echo _("Full Name") ?>
     </td><td class="item1">
       <input type="text" name="user_fullname" value="<?php echo htmlspecialchars($identity->getValue('fullname')) ?>" />
     </td>
   </tr><tr>
-    <td nowrap="nowrap" align="right" class="light">
+    <td nowrap="nowrap" class="light rightAlign">
       <?php echo _("Email Address") ?>
     </td><td class="item0">
       <input type="text" name="user_email"  value="<?php echo htmlspecialchars($identity->getValue('from_addr')) ?>" />
     </td>
   </tr><tr>
-    <td class="smallheader" align="left" colspan="2">
+    <td class="smallheader leftAlign" colspan="2">
       <input type="submit" class="button" name="submit" onclick="return validate_update();" value="<?php echo _("Update user") ?>" />
       <input type="reset" class="button" name="reset" value="<?php echo _("Reset") ?>" />
     </td>
diff -ur horde-orig/templates/help/menu.inc horde-changed/templates/help/menu.inc
--- horde-orig/templates/help/menu.inc	2005-01-03 04:32:00.000000000 +0330
+++ horde-changed/templates/help/menu.inc	2005-05-03 15:52:01.000000000 +0430
@@ -1,8 +1,8 @@
 <div class="header">
- <span style="float:left">
+ <span class="leftFloat">
   <?php echo $topics_link ?>
  </span>
- <span style="float:right">
+ <span class="rightFloat">
   <?php echo $about_link ?>
  </span>
  <span style="clear:both">&nbsp;</span>
diff -ur horde-orig/templates/prefs/app.inc horde-changed/templates/prefs/app.inc
--- horde-orig/templates/prefs/app.inc	2005-04-15 17:19:08.000000000 +0430
+++ horde-changed/templates/prefs/app.inc	2005-05-03 16:00:05.000000000 +0430
@@ -1,6 +1,6 @@
 <div class="header">
  <form method="get" name="appswitch" action="<?php echo Horde::selfUrl() ?>">
-  <span class="smallheader" style="float:right">
+  <span class="smallheader rightFloat">
    <?php echo Util::formInput() ?>
    <?php echo _("Edit options for:") ?>
    <select name="app" onchange="document.appswitch.submit();">
diff -ur horde-orig/templates/problem/problem.inc horde-changed/templates/problem/problem.inc
--- horde-orig/templates/problem/problem.inc	2005-03-20 18:48:49.000000000 +0330
+++ horde-changed/templates/problem/problem.inc	2005-05-03 15:36:33.000000000 +0430
@@ -30,17 +30,17 @@
 </tr>
 
 <tr>
-    <td class="light" align="right"><?php echo _("Your Name") ?></td>
+    <td class="light rightAlign"><?php echo _("Your Name") ?></td>
     <td><input type="text" tabindex="1" name="name" value="<?php echo $name ?>" size="70" /></td>
 </tr>
 
 <tr>
-    <td class="light" align="right"><?php echo _("Your Email Address") ?></td>
+    <td class="light rightAlign"><?php echo _("Your Email Address") ?></td>
     <td><input type="text" tabindex="2" name="email" value="<?php echo $email ?>" size="70" /></td>
 </tr>
 
 <tr>
-    <td class="light" align="right"><?php echo _("Short Summary") ?></td>
+    <td class="light rightAlign"><?php echo _("Short Summary") ?></td>
     <td><input type="text" tabindex="3" name="subject" value="<?php echo $subject ?>" size="70" /></td>
 </tr>
 
diff -ur horde-orig/templates/shares/edit.inc horde-changed/templates/shares/edit.inc
--- horde-orig/templates/shares/edit.inc	2005-03-22 01:55:28.000000000 +0430
+++ horde-changed/templates/shares/edit.inc	2005-05-03 17:33:24.000000000 +0430
@@ -8,7 +8,7 @@
 <table width="100%" cellspacing="0">
 <tr valign="middle">
   <td width="100%" colspan="6" class="header">
-    <span style="float:right">
+    <span class="rightFloat">
       <a onclick="javascript:window.close();" style="cursor: pointer;"><?php echo Horde::img('close.png', _("Close Window"), '', $registry->getImageDir('horde')) ?></a>
     </span>
     <?php echo Horde::img('perms.png', '', '', $registry->getImageDir('horde')) ?>&nbsp;<?php echo sprintf(_("Edit permissions for %s"), $share->get('name')) ?>
@@ -27,14 +27,14 @@
       }
 ?>
 <tr valign="middle">
-  <td class="header" align="left" width="55%">
+  <td class="header leftAlign" width="55%">
     <?php echo Horde::img('perms.png', '', '', $registry->getImageDir('horde')) . '&nbsp;' . _("Owner Permissions") ?>
   </td>
   <td class="header" align="center" width="1%"><?php echo _("Show") ?></td>
   <td class="header" align="center" width="1%"><?php echo _("Read") ?></td>
   <td class="header" align="center" width="1%"><?php echo _("Edit") ?></td>
   <td class="header" align="center" width="1%"><?php echo _("Delete") ?></td>
-  <td class="header" align="right" width="40%">&nbsp;</td>
+  <td class="header rightAlign" width="40%">&nbsp;</td>
 </tr>
 <tr>
 <?php if ($auth->hasCapability('list')): ?>
@@ -61,14 +61,14 @@
 
 <!-- Default Permissions -->
 <tr valign="middle">
-  <td class="header" align="left">
+  <td class="header leftAlign">
     <?php echo Horde::img('perms.png', '', '', $registry->getImageDir('horde')) . '&nbsp;' . _("All Authenticated Users") ?>
   </td>
   <td class="header" align="center"><?php echo _("Show") ?></td>
   <td class="header" align="center"><?php echo _("Read") ?></td>
   <td class="header" align="center"><?php echo _("Edit") ?></td>
   <td class="header" align="center"><?php echo _("Delete") ?></td>
-  <td class="header" align="right">&nbsp;</td>
+  <td class="header rightAlign">&nbsp;</td>
 </tr>
 <?php $dperm = $perm->getDefaultPermissions(); ?>
 <tr>
@@ -84,14 +84,14 @@
 
 <!-- Guest Permissions -->
 <tr valign="middle">
-  <td class="header" align="left">
+  <td class="header leftAlign">
     <?php echo _("Guest Permissions") ?>
   </td>
   <td class="header" align="center"><?php echo _("Show") ?></td>
   <td class="header" align="center"><?php echo _("Read") ?></td>
   <td class="header" align="center"><?php echo _("Edit") ?></td>
   <td class="header" align="center"><?php echo _("Delete") ?></td>
-  <td class="header" align="right">&nbsp;</td>
+  <td class="header rightAlign">&nbsp;</td>
 </tr>
 <?php $gperm = $perm->getGuestPermissions(); ?>
 <tr>
@@ -107,14 +107,14 @@
 
 <!-- Creator Permissions -->
 <tr valign="middle">
  <td class="header" align="left">
    <?php echo Horde::img('user.png', '', '', $registry->getImageDir('horde')) . '&nbsp;' . _("Object Creator") ?>
   </td>
   <td class="header" align="center"><?php echo _("Show") ?></td>
   <td class="header" align="center"><?php echo _("Read") ?></td>
   <td class="header" align="center"><?php echo _("Edit") ?></td>
   <td class="header" align="center"><?php echo _("Delete") ?></td>
-  <td class="header" align="right"></td>
+  <td class="header rightAlign"></td>
 </tr>
 <?php $cperm = $perm->getCreatorPermissions(); ?>
 <tr>
@@ -130,14 +130,14 @@
 
 <!-- User Permissions -->
 <tr valign="middle">
  <td class="header" align="left">
    <?php echo Horde::img('user.png', '', '', $registry->getImageDir('horde')) . '&nbsp;' . _("Individual Users") ?>
   </td>
   <td class="header" align="center"><?php echo _("Show") ?></td>
   <td class="header" align="center"><?php echo _("Read") ?></td>
   <td class="header" align="center"><?php echo _("Edit") ?></td>
   <td class="header" align="center"><?php echo _("Delete") ?></td>
-  <td class="header" align="right"></td>
+  <td class="header rightAlign"></td>
 </tr>
 <?php foreach ($userperms as $user => $uperm) { if ($user != $owner) { ?>
 <tr>
@@ -173,14 +173,14 @@
 
 <!-- Group Permissions -->
 <tr valign="middle">
  <td class="header" align="left">
    <?php echo Horde::img('group.png', '', '', $registry->getImageDir('horde')) . '&nbsp;' . _("Groups") ?>
   </td>
   <td class="header" align="center"><?php echo _("Show") ?></td>
   <td class="header" align="center"><?php echo _("Read") ?></td>
   <td class="header" align="center"><?php echo _("Edit") ?></td>
   <td class="header" align="center"><?php echo _("Delete") ?></td>
-  <td class="header" align="right">&nbsp;</td>
+  <td class="header rightAlign">&nbsp;</td>
 </tr>
 <?php $groupperms = $perm->getGroupPermissions(); foreach ($groupperms as $group => $gperm): if (!$groups->exists($groups->getGroupName($group))) continue; ?>
 <tr>
diff -ur horde-orig/templates/test/footer.inc horde-changed/templates/test/footer.inc
--- horde-orig/templates/test/footer.inc	2003-04-09 04:31:10.000000000 +0430
+++ horde-changed/templates/test/footer.inc	2005-05-03 16:25:45.000000000 +0430
@@ -1,4 +1,4 @@
-<p align="left">
+<p class="leftAlign">
 <a href="http://validator.w3.org/check/referer"><img src="http://validator.w3.org/images/vxhtml10" alt="Valid XHTML 1.0!" height="31" width="88" border="0" hspace="5" /></a>
 </p>