Index: openacs.org-dev/www/templates/community-index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/community-index.adp,v
diff -u -r1.3 -r1.4
--- openacs.org-dev/www/templates/community-index.adp	31 Jul 2002 10:47:59 -0000	1.3
+++ openacs.org-dev/www/templates/community-index.adp	9 Aug 2002 17:32:10 -0000	1.4
@@ -61,16 +61,16 @@
 height="1" width="20" alt=""></td>
 
 <td align="center" valign="top" bgcolor="#efefef"  width="50%">
-
-<!-- JOB BOARDS NESTED TABLE START -->
-
+<!-- OPENACS SITES LIST - NESTED TABLE START -->
 <TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0">
 <tr>
+
 <td align="left" valign="top" bgcolor="#66ccff"><img 
 src="/templates/images/spacer.gif" alt="" height="1" width="8"></td>
 
 <td align="left" valign="top" bgcolor="#66ccff"><span 
-class="nav"><a href="jobs" class="top">Community Job Postings</a></span></td>
+class="nav"><a href="sites" class="top">OpenACS Sites</a>
+</span></td>
 
 <td align="left" valign="top" bgcolor="#66ccff"><img 
 src="/templates/images/spacer.gif" alt="" height="1" width="8"></td>
@@ -97,26 +97,32 @@
 
 <span>
 <ul>
-<multiple name=jobs>
-<if @jobs.rownum@ le @n_jobs@>
-  <li><a href="jobs/@jobs.url@">@jobs.title@</a> - @jobs.description@</li>
+<multiple name=sites>
+<if @sites.rownum@ le @n_sites@>
+  <li><a href="@sites.url@">@sites.title@</a> -- @sites.description@</li>
 </if>
 </multiple>
 </ul>
 
-<if @jobs:rowcount@ gt @n_jobs@>
-   &nbsp;&nbsp;<a href="jobs">more jobs</a>...
+<if @sites:rowcount@ gt @n_sites@>
+  &nbsp;&nbsp;<a href="oacs_sites">more sites</a>...</span>
   <br><br>
 </if>
+
 </span>
 </td>
 
 <td align="left" valign="top" bgcolor="#EFEFEF"><img 
 src="/templates/images/spacer.gif" alt="" height="1" width="8"></td>
 
+
 </tr>
+
 </table>
-<!-- NESTED TABLE END -->
+
+<!-- NESTED TABLE END-->
+
+
 </td>
 </tr>
 </TABLE>
@@ -128,17 +134,16 @@
 <table cellspacing="0" cellpadding="0" border="0" width="100%">
 <tr>
 <td valign="top" align="left" bgcolor="#efefef">
-<!-- OPENACS SITES LIST - NESTED TABLE START -->
 
+<!-- JOB BOARDS NESTED TABLE START -->
+
 <TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="0">
 <tr>
-
 <td align="left" valign="top" bgcolor="#66ccff"><img 
 src="/templates/images/spacer.gif" alt="" height="1" width="8"></td>
 
 <td align="left" valign="top" bgcolor="#66ccff"><span 
-class="nav"><a href="sites" class="top">OpenACS Sites</a>
-</span></td>
+class="nav"><a href="jobs" class="top">Community Job Postings</a></span></td>
 
 <td align="left" valign="top" bgcolor="#66ccff"><img 
 src="/templates/images/spacer.gif" alt="" height="1" width="8"></td>
@@ -165,30 +170,28 @@
 
 <span>
 <ul>
-<multiple name=sites>
-<if @sites.rownum@ le @n_sites@>
-  <li><a href="@sites.url@">@sites.title@</a> -- @sites.description@</li>
+<multiple name=jobs>
+<if @jobs.rownum@ le @n_jobs@>
+  <li><a href="jobs/@jobs.url@">@jobs.title@</a> - @jobs.description@</li>
 </if>
 </multiple>
 </ul>
 
-<if @sites:rowcount@ gt @n_sites@>
-  &nbsp;&nbsp;<a href="oacs_sites">more sites</a>...</span>
+<if @jobs:rowcount@ gt @n_jobs@>
+   &nbsp;&nbsp;<a href="jobs">more jobs</a>...
   <br><br>
 </if>
-
 </span>
 </td>
 
 <td align="left" valign="top" bgcolor="#EFEFEF"><img 
 src="/templates/images/spacer.gif" alt="" height="1" width="8"></td>
 
-
 </tr>
-
 </table>
 
-<!-- NESTED TABLE END-->
+<!-- NESTED TABLE END -->
+
 <br>
 </td>
 
Index: openacs.org-dev/www/templates/default-content.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/default-content.adp,v
diff -u -r1.3 -r1.4
--- openacs.org-dev/www/templates/default-content.adp	9 Aug 2002 11:07:20 -0000	1.3
+++ openacs.org-dev/www/templates/default-content.adp	9 Aug 2002 17:32:10 -0000	1.4
@@ -13,4 +13,12 @@
 
 @pa.content@
 </span>
-<br clear="left" />
\ No newline at end of file
+<br clear="left">
+
+<if @comments_link@ not nil>
+  @comments@
+  <p>
+    @comments_link@
+  </p>
+</if>
+
Index: openacs.org-dev/www/templates/default-content.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/default-content.tcl,v
diff -u -r1.1 -r1.2
--- openacs.org-dev/www/templates/default-content.tcl	12 Jul 2002 11:47:44 -0000	1.1
+++ openacs.org-dev/www/templates/default-content.tcl	9 Aug 2002 17:32:10 -0000	1.2
@@ -18,4 +18,4 @@
 }
 
 etp::get_page_attributes
-
+etp::get_gc_link 
Index: openacs.org-dev/www/templates/css/main.css
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/css/main.css,v
diff -u -r1.9 -r1.10
--- openacs.org-dev/www/templates/css/main.css	9 Aug 2002 16:33:09 -0000	1.9
+++ openacs.org-dev/www/templates/css/main.css	9 Aug 2002 17:32:15 -0000	1.10
@@ -1,10 +1,18 @@
-#title			{
+.forum			{
+			margin-top: 0px;
+			margin-bottom:7px;
+}
+
+.title			{
+			margin-bottom:2px;
+			margin-top: 5px;
 			font-weight: bold;
 }
 
-#item 			{
-			margin-left: 15px;
-			padding-bottom: 10px;
+.item 			{
+	                padding-bottom: 0px;	
+			margin-bottom: 5px;
+		        margin-top: 0px;
 }
 
 #description 			{
@@ -56,7 +64,7 @@
 }
 
 span.search input	{
-			font-size: 30%;						
+			font-size: 10px;						
 }
 
 span.user-status	{
@@ -175,16 +183,16 @@
 }
 
 div.sites		{
-			float: left;
+			float: right;
 			width: 59%; 
 }
 
 div.companies		{
-			float: right;
+			float: left;
 			width: 39%; 
 }
 
 div.hosting		{
-			float: left;
-			width: 39%; 
-}
\ No newline at end of file
+			float: right;
+			width: 59%; 
+}
Index: openacs.org-dev/www/templates/widgets/companies.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/companies.adp,v
diff -u -r1.2 -r1.3
--- openacs.org-dev/www/templates/widgets/companies.adp	9 Aug 2002 10:39:08 -0000	1.2
+++ openacs.org-dev/www/templates/widgets/companies.adp	9 Aug 2002 17:34:12 -0000	1.3
@@ -1,6 +1,8 @@
 <master src="../box-master">
 <property name="title"><a href="/community/companies/">@title@</a></property>
 
+We either need to list all companies, or none with just a link to the companies page.--DaveB
+<br />
 <multiple name=companies>
 <if @companies.rownum@ le @n_companies@>
   <span id="title"><a href="@companies.url@">@companies.title@</a></span>
Index: openacs.org-dev/www/templates/widgets/forums.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/forums.adp,v
diff -u -r1.2 -r1.3
--- openacs.org-dev/www/templates/widgets/forums.adp	9 Aug 2002 10:39:08 -0000	1.2
+++ openacs.org-dev/www/templates/widgets/forums.adp	9 Aug 2002 17:34:12 -0000	1.3
@@ -3,5 +3,5 @@
 
 <multiple name=forums>
   <span id="title"><a href="/forums/forum-view?forum_id=@forums.forum_id@">@forums.short_name@</a></span>
-  <br>
-</multiple>
\ No newline at end of file
+<br>
+</multiple>
Index: openacs.org-dev/www/templates/widgets/postings.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs.org-dev/www/templates/widgets/postings.adp,v
diff -u -r1.3 -r1.4
--- openacs.org-dev/www/templates/widgets/postings.adp	9 Aug 2002 10:39:08 -0000	1.3
+++ openacs.org-dev/www/templates/widgets/postings.adp	9 Aug 2002 17:34:12 -0000	1.4
@@ -3,13 +3,13 @@
 
 <multiple name=forum_posts>
 <if @forum_posts.rownum@ le @n_posts@>
-  <span id="title"><a href="/forums/forum-view?forum_id=@forum_posts.forum_id@">@forum_posts.forum_name@</a></span><br>
+<div class="forum"> <p class="title"><a href="/forums/forum-view?forum_id=@forum_posts.forum_id@">@forum_posts.forum_name@</a></p>
 
 <group column="forum_id">
-  <span id="item"><a href="/forums/message-view?message_id=@forum_posts.message_id@">@forum_posts.title@</a></span><br>
+ <p class="item"><a href="/forums/message-view?message_id=@forum_posts.message_id@">@forum_posts.title@</a></p>
 </group>
 
-  <br><br>
+</div>
 </if>
 </multiple>