Index: openacs-4/www/templates/default-content.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/templates/Attic/default-content.adp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/www/templates/default-content.adp	1 Dec 2004 10:42:20 -0000	1.1.2.1
+++ openacs-4/www/templates/default-content.adp	31 Jan 2005 15:23:13 -0000	1.1.2.2
@@ -6,8 +6,10 @@
 <!-- <b>@pa.description;noquote@</b>
 <br>
 -->
-@pa.content;noquote@
 </span>
+<div id="page-body">
+@pa.content;noquote@
+</div>
 <br clear="left">
 
 <if @comments_link@ not nil>
Index: openacs-4/www/templates/default-content.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/templates/Attic/default-content.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/www/templates/default-content.tcl	1 Dec 2004 10:42:20 -0000	1.1.2.1
+++ openacs-4/www/templates/default-content.tcl	31 Jan 2005 15:23:13 -0000	1.1.2.2
@@ -16,12 +16,12 @@
 } -properties {
     pa:onerow
 }
-
-set package_id [ad_conn package_id]
-
+if {![exists_and_not_null package_id]} {
+    set package_id [ad_conn package_id]
+}
 etp::get_page_attributes
 # comment out, we haven't decided how best to use general comments
 # DaveB 2002-12-10, in response to email from Janine Sisk
-if {[parameter::get -package_id $package_id -parameter commentable_p -default 0]} {
-etp::get_gc_link 
-}
\ No newline at end of file
+#if {[parameter::get -package_id $package_id -parameter commentable_p -default 0]} {
+#etp::get_gc_link 
+#}
Index: openacs-4/www/templates/default-index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/templates/Attic/default-index.adp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/www/templates/default-index.adp	1 Dec 2004 10:42:20 -0000	1.1.2.1
+++ openacs-4/www/templates/default-index.adp	31 Jan 2005 15:23:13 -0000	1.1.2.2
@@ -1,16 +1,16 @@
 <master>
-<property name="title">@pa.title@</property>
+<property name="title">@pa.title;noquote@</property>
 <property name="context_bar">@pa.context_bar;noquote@</property>
 
 <if @pa.content@ not nil>
-@pa.content@
+@pa.content;noquote@
 </if>
 
 <blockquote><p>
 <multiple name="content_items">
-<b><a href="@content_items.url@">@content_items.title@</a></b>
+<b><a href="@content_items.url@">@content_items.title;noquote@</a></b>
 <if @content_items.description@ not nil>
- - @content_items.description@
+ - @content_items.description;noquote@
 </if>
 <br><br>
 </multiple>
@@ -21,8 +21,8 @@
 
 
 <if @comments_link@ not nil>
-  @comments@
+  @comments;noquote@
   <p>
-    @comments_link@
+    @comments_link;noquote@
   </p>
 </if>
Index: openacs-4/www/templates/default-index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/templates/Attic/default-index.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/www/templates/default-index.tcl	1 Dec 2004 10:42:20 -0000	1.1.2.1
+++ openacs-4/www/templates/default-index.tcl	31 Jan 2005 15:23:13 -0000	1.1.2.2
@@ -24,6 +24,6 @@
 set etp_link [etp::get_etp_link]
 set package_id [ad_conn package_id]
 
-if {[parameter::get -package_id $package_id -parameter commentable_p -default 0]} {
-etp::get_gc_link 
-}
\ No newline at end of file
+#if {[parameter::get -package_id $package_id -parameter commentable_p -default 0]} {
+#etp::get_gc_link 
+#}
Index: openacs-4/www/templates/faq-index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/templates/Attic/faq-index.adp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/www/templates/faq-index.adp	1 Dec 2004 10:42:20 -0000	1.1.2.1
+++ openacs-4/www/templates/faq-index.adp	31 Jan 2005 15:23:13 -0000	1.1.2.2
@@ -25,7 +25,7 @@
 <b>Q: <i>@content_items.title@</i></b>
 <br>
 <b>A:</b> 
-@content_items.content@
+@content_items.content;noquote@
 <br><br></span>
 </li>
 </multiple>
Index: openacs-4/www/templates/general-master.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/templates/Attic/general-master.adp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/www/templates/general-master.adp	1 Dec 2004 10:42:20 -0000	1.1.2.1
+++ openacs-4/www/templates/general-master.adp	31 Jan 2005 15:23:13 -0000	1.1.2.2
@@ -9,6 +9,7 @@
     <property name="focus">@focus;noquote@</property>
   </if>
   <property name="header_stuff">
+    <link rel="stylesheet" type="text/css" href="@css_url@" media="all">
     @header_stuff;noquote@
   </property>
 
Index: openacs-4/www/templates/general-master.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/templates/Attic/general-master.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/www/templates/general-master.tcl	1 Dec 2004 10:42:20 -0000	1.1.2.1
+++ openacs-4/www/templates/general-master.tcl	31 Jan 2005 15:23:13 -0000	1.1.2.2
@@ -70,14 +70,5 @@
             attribute onload "javascript:document.forms\['${form_name}'\].elements\['${element_name}'\].focus()"
 }
 
-
-# Developer-support
-
-if { [llength [namespace eval :: info procs ds_link]] == 1 } {
-     set ds_link "[ds_link]"
-} else {
-    set ds_link ""
-}
-
-
-
+# Where to find the stylesheet
+set css_url "/resources/acs-subsite/site-master.css"
Index: openacs-4/www/templates/homepage-index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/templates/Attic/homepage-index.adp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/www/templates/homepage-index.adp	1 Dec 2004 10:42:20 -0000	1.1.2.1
+++ openacs-4/www/templates/homepage-index.adp	31 Jan 2005 15:23:13 -0000	1.1.2.2
@@ -74,7 +74,7 @@
 
 <!-- main text area - MAIN TEXT -->
 <td align="left" valign="top" width="100%">
-<span>@pa.content@</span>
+<span>@pa.content;noquote@</span>
 </td>
 
 <!-- MARGIN -->
Index: openacs-4/www/templates/homepage-index.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/templates/Attic/homepage-index.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/www/templates/homepage-index.tcl	1 Dec 2004 10:42:20 -0000	1.1.2.1
+++ openacs-4/www/templates/homepage-index.tcl	31 Jan 2005 15:23:13 -0000	1.1.2.2
@@ -133,7 +133,7 @@
 
 #etp::get_content_items -package_id 4053 -limit $feature_limit \
                        -result_name feature_items
-etp::get_content_items -package_id 16464 -limit $feature_limit \
+#etp::get_content_items -package_id 16464 -limit $feature_limit \
                        -result_name feature_items
 
 
Index: openacs-4/www/templates/homepage-new-index.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/templates/Attic/homepage-new-index.adp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/www/templates/homepage-new-index.adp	1 Dec 2004 10:42:20 -0000	1.1.2.1
+++ openacs-4/www/templates/homepage-new-index.adp	31 Jan 2005 15:23:13 -0000	1.1.2.2
@@ -41,20 +41,9 @@
 </center>
 </div>
 <!-- END DOWNLOAD -->
-
-<!-- START ABOUT -->
-<div class="about">
 <include src="widgets/about" title="About OpenACS">
+<include src="widgets/features" title="Features Articles">
 </div>
-<!-- END ABOUT -->
-
-<!-- START FEATURES -->
-<div class="features">
-<include src="widgets/features" title="Featured Articles">
-</div>
-<!-- END FEATURES -->
-
-</div>
 <!-- END RIGHT PANEL -->
 
 
Index: openacs-4/www/templates/site-node.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/templates/Attic/site-node.adp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/www/templates/site-node.adp	1 Dec 2004 10:42:20 -0000	1.1.2.1
+++ openacs-4/www/templates/site-node.adp	31 Jan 2005 15:23:13 -0000	1.1.2.2
@@ -3,7 +3,7 @@
 <property name="context">@context@</property>
 
 <if @pa.content@ not nil>
-@pa.content@
+@pa.content;noquote@
 </if>
 
 <if @site_nodes:rowcount@ gt 0>
@@ -17,7 +17,7 @@
     <multiple name="content_items">
 <b><a href="@content_items.url@">@content_items.title@</a></b>
 <if @content_items.description@ not nil>
- - @content_items.description@
+ - @content_items.description;noquote@
 </if>
 <br>
 </multiple>
Index: openacs-4/www/templates/widgets/features.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/templates/widgets/Attic/features.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/www/templates/widgets/features.tcl	1 Dec 2004 10:42:23 -0000	1.1.2.1
+++ openacs-4/www/templates/widgets/features.tcl	31 Jan 2005 15:23:13 -0000	1.1.2.2
@@ -13,7 +13,6 @@
 set feature_limit [expr $n_feature_items + 1]
 
 
-etp::get_content_items -package_id 4053 -limit $feature_limit \
-                       -result_name feature_items
+etp::get_content_items -package_id 4053 -limit $feature_limit -result_name feature_items
 #etp::get_content_items -package_id 3138 -limit $feature_limit \
-                       -result_name feature_items
\ No newline at end of file
+                       -result_name feature_items
Index: openacs-4/www/templates/widgets/statistics.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/templates/widgets/Attic/statistics.adp,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/www/templates/widgets/statistics.adp	1 Dec 2004 10:42:23 -0000	1.1.2.1
+++ openacs-4/www/templates/widgets/statistics.adp	31 Jan 2005 15:23:13 -0000	1.1.2.2
@@ -1,2 +1,2 @@
 <strong>The Toolkit for Online Communities</strong><br />
-@n_users@ Community Members
+@n_users@ Community Members, <a href="@whos_online_url@">@num_users_online@ <if @num_users_online@ eq 1>member</if><else>members</else> online</a>
Index: openacs-4/www/templates/widgets/statistics.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/www/templates/widgets/Attic/statistics.tcl,v
diff -u -r1.1.2.1 -r1.1.2.2
--- openacs-4/www/templates/widgets/statistics.tcl	1 Dec 2004 10:42:23 -0000	1.1.2.1
+++ openacs-4/www/templates/widgets/statistics.tcl	31 Jan 2005 15:23:13 -0000	1.1.2.2
@@ -1,7 +1,12 @@
 
 set n_users [util_memoize {db_string select_n_users "select count(user_id) from users" -default "unknown"} 300]
 
+# Who's Online
+set num_users_online [lc_numeric [whos_online::num_users]]
 
+set whos_online_url "[subsite::get_element -element url]shared/whos-online"
+
+
 # we seed with the no. of downloads on the old site.
 # LARS 2003-08-18: I've taken this out because it makes us look stupid
 # only 3088 downloads from 6774 users ... < .5 download per user