Index: openacs-4/packages/dotlrn/www/manage-memberships-postgresql.xql
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/Attic/manage-memberships-postgresql.xql,v
diff -u -r1.2.2.1 -r1.2.2.2
--- openacs-4/packages/dotlrn/www/manage-memberships-postgresql.xql	12 Dec 2005 15:14:41 -0000	1.2.2.1
+++ openacs-4/packages/dotlrn/www/manage-memberships-postgresql.xql	15 Dec 2005 10:38:26 -0000	1.2.2.2
@@ -110,6 +110,7 @@
             select dotlrn_class_instances_full.*
             from dotlrn_class_instances_full
             where dotlrn_class_instances_full.join_policy <> 'closed'
+	    and active_end_date > (select sysdate from dual)
             and not exists (select 1
                             from dotlrn_member_rels_full
                             where dotlrn_member_rels_full.user_id = :user_id
@@ -127,11 +128,13 @@
             from dotlrn_class_instances_full
             where dotlrn_class_instances_full.department_key = :non_member_department_key
             and dotlrn_class_instances_full.join_policy <> 'closed'
+	    and active_end_date > (select sysdate from dual)
             and not exists (select 1
                             from dotlrn_member_rels_full
                             where dotlrn_member_rels_full.user_id = :user_id
                             and dotlrn_member_rels_full.community_id = dotlrn_class_instances_full.class_instance_id)
-            order by dotlrn_class_instances_full.pretty_name,
+            order by dotlrn_class_instances_full.active_start_date,
+            	     dotlrn_class_instances_full.pretty_name,
                      dotlrn_class_instances_full.community_key
         </querytext>
     </fullquery>
Index: openacs-4/packages/dotlrn/www/manage-memberships.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/manage-memberships.adp,v
diff -u -r1.28.2.1 -r1.28.2.2
--- openacs-4/packages/dotlrn/www/manage-memberships.adp	12 Dec 2005 16:53:32 -0000	1.28.2.1
+++ openacs-4/packages/dotlrn/www/manage-memberships.adp	15 Dec 2005 10:38:26 -0000	1.28.2.2
@@ -156,7 +156,7 @@
       <tr class="table-title">
         <th align="left" width="55%">#dotlrn.class_name_header#</th>
         <th align="left" width="15%">#dotlrn.Term#</th>
-        <th align="left" width="15%">&nbsp;</th>
+        <th align="left" width="15%">#dotlrn.Start_date#</th>
         <th align="center" width="15%">#dotlrn.Actions#</th>
       </tr>
 
@@ -171,13 +171,13 @@
 <if @non_member_classes.join_policy@ eq "open">
         <td><a href="<if @swa_p@ eq 1>@non_member_classes.url@</if><else>#</else>"><div id="listlink">@non_member_classes.description;noquote@</div>@non_member_classes.pretty_name@</a></td>
         <td>@non_member_classes.term_name@ @non_member_classes.term_year@</td>
-        <td>&nbsp;</td>
+        <td>@non_member_classes.active_start_date@ - @non_member_classes.active_end_date@</td>
         <td><small><include src="register-link" community_id="@non_member_classes.community_id@" referer=@referer@></small></td>
 </if>
 <else>
         <td>@non_member_classes.pretty_name@</td>
         <td>@non_member_classes.term_name@ @non_member_classes.term_year@</td>
-        <td>&nbsp;</td>
+        <td>@non_member_classes.active_start_date@ - @non_member_classes.active_end_date@</td>
         <td><small><include src="register-link" community_id="@non_member_classes.community_id@" referer=@referer@ label="Request Membership" ></small></td>
 </else>
       </tr>
@@ -208,13 +208,16 @@
     <else>
       <tr class="even">
     </else>
-        <td>@non_member_clubs.pretty_name@</td>
-        <td>&nbsp;</td>
-        <td>&nbsp;</td>
 <if @non_member_clubs.join_policy@ eq "open">
+        <td><a href="<if @swa_p@ eq 1>@non_member_clubs.url@</if><else>#</else>"><div id="listlink">@non_member_clubs.description;noquote@</div>@non_member_clubs.pretty_name@</a></td>
+        <td>&nbsp;</td>
+        <td>@non_member_classes.active_start_date@ - @non_member_classes.active_end_date@</td>
         <td><small><include src="register-link" community_id="@non_member_clubs.community_id@" referer=@referer@></small></td>
 </if>
 <else>
+        <td>@non_member_clubs.pretty_name@</td>
+        <td>&nbsp;</td>
+        <td>@non_member_classes.active_start_date@ - @non_member_classes.active_end_date@</td>
         <td><small><include src="register-link" community_id="@non_member_clubs.community_id@"referer=@referer@  label="Request Membership"></small></td>
 </else>
       </tr>
Index: openacs-4/packages/dotlrn/www/manage-memberships.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/manage-memberships.tcl,v
diff -u -r1.11.2.2 -r1.11.2.3
--- openacs-4/packages/dotlrn/www/manage-memberships.tcl	12 Dec 2005 16:53:32 -0000	1.11.2.2
+++ openacs-4/packages/dotlrn/www/manage-memberships.tcl	15 Dec 2005 10:38:26 -0000	1.11.2.3
@@ -174,11 +174,22 @@
     append non_member_query "_by_term"
 }
 
+# Is the user a .LRN admin or a sitewide admin
 set swa_p [acs_user::site_wide_admin_p -user_id $user_id] 
+if {!$swa_p} {
+    set swa_p [dotlrn::admin_p -user_id $user_id]
+}
+
 set n_non_member_classes [db_string select_n_non_member_classes {}]
-db_multirow non_member_classes $non_member_query {}
-db_multirow non_member_clubs select_non_member_clubs {}
+db_multirow non_member_classes $non_member_query {} {
+    regsub -all {<p>} $description {<br />} description
+}
 
+db_multirow non_member_clubs select_non_member_clubs {} {
+    regsub -all {<p>} $description {<br />} description
+}
+    
+
 # hack for eabis
 set non_member_club_ids [db_list non_member_club_ids {                select f.club_id
                 from dotlrn_clubs_full f