Index: openacs-4/packages/dotlrn/lib/bio.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/lib/Attic/bio.adp,v
diff -u -N -r1.3 -r1.3.2.1
--- openacs-4/packages/dotlrn/lib/bio.adp	15 May 2007 20:14:25 -0000	1.3
+++ openacs-4/packages/dotlrn/lib/bio.adp	29 Mar 2008 18:26:38 -0000	1.3.2.1
@@ -1,15 +1,15 @@
-<br clear="all" />
-<br />
+<br>
+<br>
 <if @user_id@>
 <h3>@user.name;noquote@
 <if @edit_bio_url@ not nil>
 <a href="@edit_bio_url@" class="button">#dotlrn.Edit_Biography#</a>
 </if>
 </h3>
 
-<br />
+<br>
 <if @portrait_p@>
-<img @widthheight@ src="/shared/portrait-bits.tcl?@export_vars@" alt="Portrait of @user.name@" align="left" style="padding-right: 10px;">
+<img @widthheight@ src="/shared/portrait-bits.tcl?@export_vars@" alt="Portrait of @user.name@" style="padding-right: 10px;">
 </if>
 @user.bio;noquote@
 </if>
Index: openacs-4/packages/new-portal/tcl/portal-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/tcl/portal-procs.tcl,v
diff -u -N -r1.186 -r1.186.2.1
--- openacs-4/packages/new-portal/tcl/portal-procs.tcl	11 Mar 2008 19:31:30 -0000	1.186
+++ openacs-4/packages/new-portal/tcl/portal-procs.tcl	29 Mar 2008 18:26:38 -0000	1.186.2.1
@@ -406,20 +406,18 @@
 
     set template "
         <master src=\"@master_template@\">
-        <p>
-        $return_text
-        <p>"
+        <p>$return_text</p>"
 
     #
     # Theme selection chunk
     #
 
     set theme_chunk "
             <form method=post action=@action_string@>
-            <input type=hidden name=portal_id value=@portal_id@>
-            <input type=hidden name=return_url value=\"@return_url@\">
-            <strong>[_ new-portal.Change_Theme]</strong>
-            <br>"
+            <div><input type=hidden name=portal_id value=@portal_id@></div>
+            <div><input type=hidden name=return_url value=\"@return_url@\"></div>
+            <p><strong>[_ new-portal.Change_Theme]</strong></p>"
+
     set current_theme_id [portal::get_theme_id -portal_id $portal_id]
 
     foreach theme [get_theme_info_not_cached] {
@@ -438,7 +436,7 @@
         append theme_chunk "</label><br>\n"
     }
 
-    append theme_chunk "<input type=submit name=\"op_change_theme\" value=\"[_ new-portal.Change_Theme_1]\"></form>"
+    append theme_chunk "<div><input type=submit name=\"op_change_theme\" value=\"[_ new-portal.Change_Theme_1]\"></div></form>"
     if {$allow_theme_change_p} {
         append template "$theme_chunk"
     }
@@ -464,7 +462,7 @@
             set tab_toggle_label [lang::util::localize "\#new-portal.Hide_in_main_navigation\#"]
         }
         
-        append template "<table bgcolor=\"#eeeeee\" border=0 width=\"100%\">"
+        append template "<table style=\"background-color:#eeeeee\" border=0 width=\"100%\">"
 
         #
         # Page rename chunk
@@ -477,25 +475,25 @@
           </td>
           <td align=right>
            <a name=$page_id></a>
-           <form name=\"op_rename_page\" method=post action=@action_string@>
-            <input type=hidden name=portal_id value=@portal_id@>
-            <input type=hidden name=page_id value=$page_id>
-            <input type=hidden name=return_url value=\"@return_url@#$page_id\">
-            <input type=hidden name=anchor value=$page_id>
-            <input type=submit name=\"op_rename_page\" value=\"[_ new-portal.Rename_Page]\">
-            <input type=text name=pretty_name value=\"[ad_quotehtml $page_name]\">
+           <form name=\"op_rename_page\" method=post action=@action_string@ class=\"inline-form\">
+            <div><input type=hidden name=portal_id value=@portal_id@></div>
+            <div><input type=hidden name=page_id value=$page_id></div>
+            <div><input type=hidden name=return_url value=\"@return_url@#$page_id\"></div>
+            <div><input type=hidden name=anchor value=$page_id></div>
+            <div><input type=submit name=\"op_rename_page\" value=\"[_ new-portal.Rename_Page]\"></div>
+            <div><input type=text name=pretty_name value=\"[ad_quotehtml $page_name]\"></div>
            </form>
            <form name=\"op_toggle_tab_visibility\" method=post action=@action_string@>
-            <input type=hidden name=portal_id value=@portal_id@>
-            <input type=hidden name=page_id value=$page_id>
-            <input type=hidden name=return_url value=\"@return_url@#$page_id\">
-            <input type=hidden name=anchor value=$page_id>
-            <input type=submit name=\"op_toggle_tab_visibility\" value=\"$tab_toggle_label\">
+            <div><input type=hidden name=portal_id value=@portal_id@></div>
+            <div><input type=hidden name=page_id value=$page_id></div>
+            <div><input type=hidden name=return_url value=\"@return_url@#$page_id\"></div>
+            <div><input type=hidden name=anchor value=$page_id></div>
+            <div><input type=submit name=\"op_toggle_tab_visibility\" value=\"$tab_toggle_label\"></div>
            </form>
           </td>
          </tr>
          <tr>
-          <td colspan=2 class=\"bottom-border\" height=\"1\">
+          <td colspan=2 class=\"bottom-border\" style=\"height:1\">
            <img src=\"/resources/acs-subsite/spacer.gif\" height=1 alt=\"\">
           </td>
          </tr>
@@ -529,7 +527,7 @@
             append template "
             <tr>
              <td>
-              <table class=\"portal-page-config\" bgcolor=\"#eeeeee\" border=0 width=\"100%\">
+              <table class=\"portal-page-config\" style=\"background-color:#eeeeee\" border=0 width=\"100%\">
                <tr valign=middle>
                 <td valign=middle>
                  <include src=\"$layout\"
@@ -580,13 +578,13 @@
                 append template "
                 <tr valign=middle>
                  <td valign=middle>
-                  <center>
+                  <div style=\"text-align:center\">
                    [_ new-portal.lt_No_Elements_on_this_p]
                    <form method=post action=@action_string@>
                     [export_vars -form { portal_id page_id return_url { anchor $page_id } }]
-                    <input type=submit name=\"op_remove_empty_page\" value=\"[_ new-portal.Remove_Empty_Page]\">
+                    <div><input type=submit name=\"op_remove_empty_page\" value=\"[_ new-portal.Remove_Empty_Page]\"></div>
                    </form>
-                  </center>
+                  </div>
                  </td>
                 </tr>"
             }
@@ -601,16 +599,16 @@
                 set layout_id [ns_set get $layout layout_id]
                 set layout_name [ns_set get $layout layout_name]
                 set layout_description [ns_set get $layout layout_description]
-                set one_layout_chunk "<small>&nbsp;$layout_name - $layout_description</small>"
-                append layout_chunk "<label><input type=radio name=layout_id value=$layout_id"
+                set one_layout_chunk "&nbsp;$layout_name - $layout_description"
+                append layout_chunk "<div><label><input type=radio name=layout_id value=$layout_id"
 
                 if {$page_layout_id == $layout_id} {
                     append layout_chunk " checked><b>$one_layout_chunk</b>"
                 } else {
                     append layout_chunk ">$one_layout_chunk"
                 }
 
-                append layout_chunk "</label><br>"
+                append layout_chunk "</label></div>"
             }
 
 
@@ -619,16 +617,13 @@
              <td>
               <br>
               <form method=post action=@action_string@>
-               <small>
-                <b>[_ new-portal.Change_page_layout]</b>
-                <br>
-                <input type=hidden name=portal_id value=$portal_id>
-                <input type=hidden name=page_id value=$page_id>
-                <input type=hidden name=return_url value=\"@return_url@\">
-                <input type=hidden name=anchor value=$page_id>
+                <p><b>[_ new-portal.Change_page_layout]</b></p>
+                <div><input type=hidden name=portal_id value=$portal_id></div>
+                <div><input type=hidden name=page_id value=$page_id></div>
+                <div><input type=hidden name=return_url value=\"@return_url@\"></div>
+                <div><input type=hidden name=anchor value=$page_id></div>
                 $layout_chunk
-                <input type=submit name=\"op_change_page_layout\" value=\"[_ new-portal.Change_Page_Layout]\">
-               </small>
+                <div><input type=submit name=\"op_change_page_layout\" value=\"[_ new-portal.Change_Page_Layout]\"></div>
               </form>
              </td>
             </tr>"
@@ -658,13 +653,13 @@
      <td>
       <a name=add_a_new_page></a>
        <form name=\"op_add_page\" method=post action=@action_string@>
-        <input type=hidden name=portal_id value=@portal_id@>
-        <input type=hidden name=return_url value=\"@return_url@#$page_id\">
-        <input type=hidden name=anchor value=add_a_new_page>
-        <center>
+        <div><input type=hidden name=portal_id value=@portal_id@></div>
+        <div><input type=hidden name=return_url value=\"@return_url@#$page_id\"></div>
+        <div><input type=hidden name=anchor value=add_a_new_page></div>
+        <div style=\"text-align:center\">
          <input type=text name=pretty_name value=\"[_ new-portal.Page] $new_page_num\">
          <input type=submit name=\"op_add_page\" value=\"[_ new-portal.Add_Page]\">
-        </center>
+        </div>
        </form>
       </td>
      </tr>
@@ -680,12 +675,12 @@
          <tr>
           <td>
            <form name=\"op_revert\" method=post action=@action_string@>
-            <input type=hidden name=portal_id value=@portal_id@>
-            <input type=hidden name=return_url value=\"@return_url@\">
+            <div><input type=hidden name=portal_id value=@portal_id@></div>
+            <div><input type=hidden name=return_url value=\"@return_url@\"></div>
             <h2 class=\"portal-page-name\">[_ new-portal.lt_Revert_the_entire_por]</h2>
-            <center>
+            <div style=\"text-align:center\">
              <input type=submit name=\"op_revert\" value=\"[_ new-portal.Revert]\">
-            </center>
+            </div>
            </form>
           </td>
          </tr>
@@ -699,14 +694,14 @@
          <tr>
           <td>
            <form name=\"op_revert_all\" method=post action=@action_string@>
-            <input type=hidden name=portal_id value=@portal_id@>
-            <input type=hidden name=return_url value=\"@return_url@\">
+            <div><input type=hidden name=portal_id value=@portal_id@></div>
+            <div><input type=hidden name=return_url value=\"@return_url@\"></div>
             <h2 class=\"portal-page-name\">[_ new-portal.lt_Revert_all_portals_us]</h2>
-            <center>
+            <div style=\"text-align:center\">
              <input type=submit name=\"op_revert_all\" value=\"[_ new-portal.Revert_All]\">
              <br />
              <i>[_ new-portal.lt_Note_Please_be_patien]</i>
-            </center>
+            </div>
            </form>
           </td>
          </tr>
Index: openacs-4/packages/new-portal/www/place-element-other-page.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/place-element-other-page.adp,v
diff -u -N -r1.10 -r1.10.14.1
--- openacs-4/packages/new-portal/www/place-element-other-page.adp	23 Oct 2003 12:29:00 -0000	1.10
+++ openacs-4/packages/new-portal/www/place-element-other-page.adp	29 Mar 2008 18:26:38 -0000	1.10.14.1
@@ -18,20 +18,21 @@
 
 %>
 
-<form name="op_move_to_page" method=post action=@action_string@>
-<input type=hidden name=portal_id value=@portal_id@>
-<input type=hidden name=return_url value=@return_url@>
+<form name="op_move_to_page" method=post action=@action_string@ class="inline-form">
+<div><input type=hidden name=portal_id value=@portal_id@></div>
+<div><input type=hidden name=return_url value=@return_url@></div>
 
 <if @other_page_avail_p@ ne 0>
-  <input type=hidden name=element_id value=@element_id@>
-  <input type=hidden name=anchor value=@page_id@>
-  <input type=submit name="op_move_to_page" value="#new-portal.Move_to_page#">
+  <div><input type=hidden name=element_id value=@element_id@></div>
+  <div><input type=hidden name=anchor value=@page_id@></div>
+  <div><input type=submit name="op_move_to_page" value="#new-portal.Move_to_page#"></div>
+  <div>
   <select name=page_id>
   <multiple name=pages>
   <option value=@pages.page_id@><%= [lang::util::localize "@pages.pretty_name@"] %></option>
   </multiple>
   </select>
-
+  </div>
 </if>
 
 </form>
Index: openacs-4/packages/new-portal/www/place-element.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/place-element.adp,v
diff -u -N -r1.45 -r1.45.2.1
--- openacs-4/packages/new-portal/www/place-element.adp	15 May 2007 20:14:48 -0000	1.45
+++ openacs-4/packages/new-portal/www/place-element.adp	29 Mar 2008 18:26:38 -0000	1.45.2.1
@@ -23,9 +23,9 @@
 
 <if @element_multi.rownum@ eq 1>
     <form method=post action=@action_string@>
-        <input type=hidden name=portal_id value=@portal_id@>
-        <input type=hidden name=region value=@region@>
-        <input type=hidden name=page_id value=@page_id@>
+        <div><input type=hidden name=portal_id value=@portal_id@></div>
+        <div><input type=hidden name=region value=@region@></div>
+        <div><input type=hidden name=page_id value=@page_id@></div>
 </if>
   <div class="portlet-header">
     <div class="portlet-title">
@@ -39,7 +39,7 @@
             <!-- hide_remove_url -->
             <span class="screen-reader-only">[</span>
             <a href="@element_multi.hide_remove_url@" title="#new-portal.remove_portlet#">
-                <img src="@imgdir@/delete.gif" border=0 alt="#new-portal.remove#">
+                <img src="@imgdir@/delete.gif" style="border:0" alt="#new-portal.remove#">
             </a>
             <span class="screen-reader-only">]</span>
 
@@ -48,7 +48,7 @@
                     <!-- move_up_url -->
                 <span class="screen-reader-only">[</span>
                     <a href="@element_multi.move_up_url@" title="#new-portal.move_portlet_up#">
-                        <img border="0" src="@imgdir@/arrow-up.gif" alt="#new-portal.move_up#">
+                        <img style="border:0" src="@imgdir@/arrow-up.gif" alt="#new-portal.move_up#">
                     </a>
                 <span class="screen-reader-only">]</span>
                 </if>
@@ -57,7 +57,7 @@
                     <!-- move_down_url -->
                 <span class="screen-reader-only">[</span>
                     <a href="@element_multi.move_down_url@" title="#new-portal.move_portlet_down#">
-                        <img border="0" src="@imgdir@/arrow-down.gif" alt="#new-portal.move_down#">
+                        <img style="border:0" src="@imgdir@/arrow-down.gif" alt="#new-portal.move_down#">
                     </a>
                 <span class="screen-reader-only">]</span>
                 </if>
@@ -68,7 +68,7 @@
                     <!-- move_right_with_anchor_url -->
                 <span class="screen-reader-only">[</span>
                     <a href="@element_multi.move_right_wa_url@" title="#new-portal.move_portlet_right#">
-                        <img border="0" src="@imgdir@/arrow-right.gif" alt="#new-portal.move_right#">
+                        <img style="border:0" src="@imgdir@/arrow-right.gif" alt="#new-portal.move_right#">
                     </a>
                 <span class="screen-reader-only">]</span>
                 </if>
@@ -77,13 +77,13 @@
                     <!-- move_left_with_anchor_url -->
                 <span class="screen-reader-only">[</span>
                     <a href="@element_multi.move_left_wa_url@" title="#new-portal.move_portlet_left#">
-                        <img border="0" src="@imgdir@/arrow-left.gif" alt="#new-portal.move_left#">
+                        <img style="border:0" src="@imgdir@/arrow-left.gif" alt="#new-portal.move_left#">
                     </a>
                 <span class="screen-reader-only">]</span>
                     <!-- move_right_url -->
                 <span class="screen-reader-only">[</span>
                     <a href="@element_multi.move_right_url@" title="#new-portal.move_portlet_right#">
-                        <img border="0" src="@imgdir@/arrow-right.gif" alt="#new-portal.move_right#">
+                        <img style="border:0" src="@imgdir@/arrow-right.gif" alt="#new-portal.move_right#">
                     </a>
                 <span class="screen-reader-only">]</span>
                 </if>
@@ -92,7 +92,7 @@
                     <!-- move_left_with_anchor_url -->
                 <span class="screen-reader-only">[</span>
                     <a href="@element_multi.move_left_wa_url@" title="#new-portal.move_portlet_left#">
-                        <img border="0" src="@imgdir@/arrow-left.gif" alt="#new-portal.move_left#">
+                        <img style="border:0" src="@imgdir@/arrow-left.gif" alt="#new-portal.move_left#">
                     </a>
                 <span class="screen-reader-only">]</span>
                 </if>
Index: openacs-4/packages/new-portal/www/show-here.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/show-here.adp,v
diff -u -N -r1.5 -r1.5.2.1
--- openacs-4/packages/new-portal/www/show-here.adp	15 May 2007 20:14:48 -0000	1.5
+++ openacs-4/packages/new-portal/www/show-here.adp	29 Mar 2008 18:26:38 -0000	1.5.2.1
@@ -7,16 +7,20 @@
     <div class="portlet">
 <if @show_avail_p@ ne 0>
     <form method="post" action="@action_string@">
-        <input type=hidden name=portal_id value=@portal_id@>
-        <input type=hidden name=region value=@region@>
-        <input type=hidden name=page_id value=@page_id@>
-        <input type=hidden name=return_url value=@return_url@>
-        <input type=hidden name="op_show_here" value="Show Here">
-        <input type=hidden name=anchor value=@page_id@>
-        <!--<select>-->
+        <div><input type=hidden name=portal_id value=@portal_id@></div>
+        <div><input type=hidden name=region value=@region@></div>
+        <div><input type=hidden name=page_id value=@page_id@></div>
+        <div><input type=hidden name=return_url value=@return_url@></div>
+        <div><input type=hidden name="op_show_here" value="Show Here"></div>
+        <div><input type=hidden name=anchor value=@page_id@></div>
+        <div>
+          <!--<select>-->
             @show_html;noquote@
-        </select>
-    <input type=submit name="op_show_here" value="#new-portal.lt_Add_This_Portlet_Here#">
+          </select>
+        </div>
+        <div>
+          <input type=submit name="op_show_here" value="#new-portal.lt_Add_This_Portlet_Here#">
+        </div>
 </form>
 </if>
 <else>
Index: openacs-4/packages/new-portal/www/layouts/simple1.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/layouts/simple1.adp,v
diff -u -N -r1.5 -r1.5.18.1
--- openacs-4/packages/new-portal/www/layouts/simple1.adp	9 Aug 2002 20:56:30 -0000	1.5
+++ openacs-4/packages/new-portal/www/layouts/simple1.adp	29 Mar 2008 18:26:39 -0000	1.5.18.1
@@ -22,7 +22,7 @@
 
   <table border=0 width="100%">
     <tr>
-      <td valign=top width="50%">
+      <td valign=top style="width:50%">
         <list name="element_ids_1">
           <include src="@element_src@" 
           element_id="@element_ids_1:item@" 
Index: openacs-4/packages/new-portal/www/layouts/simple3.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/new-portal/www/layouts/simple3.adp,v
diff -u -N -r1.4 -r1.4.18.1
--- openacs-4/packages/new-portal/www/layouts/simple3.adp	9 Aug 2002 20:56:30 -0000	1.4
+++ openacs-4/packages/new-portal/www/layouts/simple3.adp	29 Mar 2008 18:26:39 -0000	1.4.18.1
@@ -22,7 +22,7 @@
 
 <table border="0" width="100%">
   <tr>
-    <td valign="top" width="33%">
+    <td valign="top" style="width:33%">
       <list name="element_ids_1">
         <include src="@element_src@"
                  element_id="@element_ids_1:item@"
@@ -38,7 +38,7 @@
         <br>
       </list>
     </td>
-    <td valign="top" width="33%">
+    <td valign="top" style="width:33%">
       <list name="element_ids_2">
         <include src="@element_src@"
                  element_id="@element_ids_2:item@"
@@ -54,7 +54,7 @@
         <br>
       </list>
     </td>
-    <td valign="top" width="33%">
+    <td valign="top" style="width:33%">
       <list name="element_ids_3">
         <include src="@element_src@"
                  element_id="@element_ids_3:item@"