Index: openacs.org-dev/www/templates/box-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/box-master.adp,v
diff -u -r1.9 -r1.10
--- openacs.org-dev/www/templates/box-master.adp	12 Nov 2002 18:38:57 -0000	1.9
+++ openacs.org-dev/www/templates/box-master.adp	27 Aug 2008 00:11:25 -0000	1.10
@@ -7,11 +7,9 @@
   </tr>
   <tr bgcolor="#006699">
     <td><img src="/templates/slices/spacer.gif" width="1" height="1" border="0" alt=""></td>
-    <td><span class="box-title">@title@</span></td>
+    <td><h2 class="box-title">@title;noquote@</h2></td>
     <td><img src="/templates/slices/spacer.gif" width="1" height="1" border="0" alt="">
   </tr>
-<!-- </table>
-<table border="0" cellpadding="0" cellspacing="0" width="100%"> -->
   <tr>
     <td bgcolor="#cccccc" background="/templates/slices/006699-9x1-left.gif"><img src="/templates/slices/spacer.gif" width="9" height="4" border="0" alt=""></td>
     <td bgcolor="#cccccc" width="100%"><img src="/templates/slices/spacer.gif" width="1" height="4" border="0" alt=""></td>
@@ -22,15 +20,11 @@
     <td width="100%"><div class="box-content"><slave></div></td>
     <td background="/templates/slices/006699-9x1-right.gif"><img src="/templates/slices/spacer.gif" width="9" height="4" border="0" alt=""></td>
   </tr>
-<!-- </table>
-<table border="0" cellpadding="0" cellspacing="0" width="100%"> -->
   <tr>
     <td><img src="/templates/slices/lowleft2.gif" width="9" height="9" border="0" alt=""></td>
     <td width="100%"><img src="/templates/slices/spacer.gif" width="1" height="1" border="0" alt=""></td>
     <td><img src="/templates/slices/lowright2.gif" width="9" height="9" border="0" alt=""></td>
   </tr>
-<!-- </table>
-<table border="0" cellpadding="0" cellspacing="0" width="100%"> -->
   <tr>
     <td><img src="/templates/slices/spacer.gif" width="9" height="1" border="0" alt=""></td>
     <td bgcolor="#006699" width="100%"><img src="/templates/slices/spacer.gif" width="1" height="1" border="0" alt=""></td>
Index: openacs.org-dev/www/templates/homepage-new-index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/homepage-new-index.adp,v
diff -u -r1.11 -r1.12
--- openacs.org-dev/www/templates/homepage-new-index.adp	28 Jan 2003 16:16:54 -0000	1.11
+++ openacs.org-dev/www/templates/homepage-new-index.adp	27 Aug 2008 00:11:25 -0000	1.12
@@ -1,10 +1,25 @@
 <master>
-<property name="title">@pa.title@</property>
+<property name="title">OpenACS Home</property>
 
+
+<h1 style="display:none">OpenACS</h1>
+
 <!-- START LEFT PANEL -->
 
 <div class="left-panel">
+  <include src="widgets/about">
+  <include src="widgets/download">
+  <include src="widgets/resources">
+  <include src="widgets/sponsors">
+</div>
 
+<!-- END LEFT PANEL -->
+
+
+<!-- START MAIN CONTENT -->
+
+<div class="main-content">
+
 <!-- START NEWS -->
 <div class="news">
 <include src="widgets/news" title="News">
@@ -19,43 +34,6 @@
 
 </div>
 
-<!-- END LEFT PANEL -->
-
-
-<!-- START MAIN CONTENT -->
-
-<div class="main-content">
-@pa.content@
-</div>
-
 <!-- END MAIN CONTENT -->
 
 
-<!-- START RIGHT PANEL -->
-<div class="right-panel">
-
-<!-- START DOWNLOAD -->
-<div class="download">
-<center>
-<a href="/projects/openacs/download/"><img src="/templates/slices/unleash.gif" width="118" height="53"  border="0" alt="Download OpenACS"></a>
-</center>
-</div>
-<!-- END DOWNLOAD -->
-
-<!-- START ABOUT -->
-<div class="about">
-<include src="widgets/about" title="About OpenACS">
-</div>
-<!-- END ABOUT -->
-
-<!-- START FEATURES -->
-<div class="features">
-<include src="widgets/features" title="Featured Articles">
-</div>
-<!-- END FEATURES -->
-
-</div>
-<!-- END RIGHT PANEL -->
-
-
-