Index: openacs-4/packages/calendar/www/view-one-day-display.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/calendar/www/view-one-day-display.adp,v
diff -u -r1.17.2.5 -r1.17.2.6
--- openacs-4/packages/calendar/www/view-one-day-display.adp	22 Nov 2006 15:57:12 -0000	1.17.2.5
+++ openacs-4/packages/calendar/www/view-one-day-display.adp	24 Nov 2006 10:39:38 -0000	1.17.2.6
@@ -1,9 +1,9 @@
 <table class="cal-table-display" cellpadding="1" cellspacing="2" width="99%">
   <tr>
     <td class="cal-month-title-text">
-      <a href="@previous_week_url@"><img border=0 src="<%=[dt_left_arrow]%>" alt="#calendar.prev_day#"></a>
+      <a href="@previous_week_url@" title="#calendar.prev_day#"><img border=0 src="<%=[dt_left_arrow]%>" alt="#calendar.prev_day#"></a>
       @dates@
-      <a href="@next_week_url@"><img border=0 src="<%=[dt_right_arrow]%>" alt="#calendar.next_day#"></a>
+      <a href="@next_week_url@" title="#calendar.next_day#"><img border=0 src="<%=[dt_right_arrow]%>" alt="#calendar.next_day#"></a>
     </td>
   </tr>
   <tr>
Index: openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml,v
diff -u -r1.43.2.24 -r1.43.2.25
--- openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml	23 Nov 2006 12:18:16 -0000	1.43.2.24
+++ openacs-4/packages/dotlrn/catalog/dotlrn.en_US.ISO-8859-1.xml	24 Nov 2006 10:39:39 -0000	1.43.2.25
@@ -221,6 +221,11 @@
   <msg key="General_Site_Help">General Site Help</msg>
   <msg key="goto_admin_pretty_name">Go to %admin_pretty_name%</msg>
   <msg key="goto_communities_pretty_name_portal">Go to %communities.pretty_name% portal</msg>
+  <msg key="goto_current_clubs">Go to current communities</msg>
+  <msg key="goto_join_class">Go to Join a class</msg>
+  <msg key="goto_join_clubs">Go to Join a community</msg>
+  <msg key="goto_member_classes_pretty_name">Go to %member_classes.pretty_name% portal</msg>
+  <msg key="goto_member_clubs_pretty_name">Go to %member_clubs.pretty_name% portal</msg>
   <msg key="goto_oacs_swa">Goto OpenACS Site Wide Administration</msg>
   <msg key="goto_subgroup_name">Go to subgroup %subgroup_name%</msg>
   <msg key="Grant_site_wide_admin">Grant site-wide administrative privileges.</msg>
@@ -538,7 +543,7 @@
   <msg key="Remove_all">Remove all</msg>
   <msg key="Request_Membership">Request Membership</msg>
   <msg key="Request_Membership_for_subgroup_name">Request membership for %subgroup_name%</msg>
-  <msg key="request_membership_link">&lt;img src=/resources/dotlrn/request.gif alt=&quot;%label%&quot; border=&quot;0&quot; title=&quot;Request Membership&quot;&gt;</msg>
+  <msg key="request_membership_link">&lt;img src=/resources/dotlrn/request.gif alt=&quot;%label%&quot; border=&quot;0&quot;&gt;</msg>
   <msg key="required">Required field</msg>
   <msg key="Results">Results</msg>
   <msg key="Return_URL">Return URL</msg>
Index: openacs-4/packages/dotlrn/www/deregister-link.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/deregister-link.adp,v
diff -u -r1.13 -r1.13.2.1
--- openacs-4/packages/dotlrn/www/deregister-link.adp	12 Jul 2004 14:49:56 -0000	1.13
+++ openacs-4/packages/dotlrn/www/deregister-link.adp	24 Nov 2006 10:39:39 -0000	1.13.2.1
@@ -17,4 +17,7 @@
     #
 
 %>
-<a href="<if @url@ nil>#dotlrn.deregister#<if @referer@ not nil>?referer=@referer@</if></if><else>@url@<if @referer@ not nil>?referer=@referer@</if></else>"><if @label@ nil>#dotlrn.drop_membership_link#</if><else>@label@</else></a>
+<a href="<if @url@ nil>#dotlrn.deregister#<if @referer@ not nil>?referer=@referer@</if></if><else>@url@<if @referer@ not nil>?referer=@referer@</if></else>" title="#dotlrn.Drop_Membership#">
+    <if @label@ nil>#dotlrn.drop_membership_link#</if>
+    <else>@label@</else>
+</a>
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.2 -r1.2.2.3
--- openacs-4/packages/dotlrn/www/manage-memberships-postgresql.xql	15 Dec 2005 10:38:26 -0000	1.2.2.2
+++ openacs-4/packages/dotlrn/www/manage-memberships-postgresql.xql	24 Nov 2006 10:39:39 -0000	1.2.2.3
@@ -110,7 +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 (active_end_date > (select sysdate from dual) or active_end_date is null)
             and not exists (select 1
                             from dotlrn_member_rels_full
                             where dotlrn_member_rels_full.user_id = :user_id
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.3 -r1.28.2.4
--- openacs-4/packages/dotlrn/www/manage-memberships.adp	16 Dec 2005 11:31:17 -0000	1.28.2.3
+++ openacs-4/packages/dotlrn/www/manage-memberships.adp	24 Nov 2006 10:39:39 -0000	1.28.2.4
@@ -26,11 +26,11 @@
 
 <p>
   <small>
-    <a href="#current_clubs">#dotlrn.lt_Current_clubs_pretty_#</a>
+    <a href="#current_clubs" title="#dotlrn.goto_current_clubs#">#dotlrn.lt_Current_clubs_pretty_#</a>
     |
-    <a href="#join_classes">#dotlrn.lt_Join_a_class_instance#</a>
+    <a href="#join_classes" title="#dotlrn.goto_join_class#">#dotlrn.lt_Join_a_class_instance#</a>
     |
-    <a href="#join_clubs">#dotlrn.lt_Join_a_clubs_pretty_n#</a>
+    <a href="#join_clubs" title="#dotlrn.goto_join_clubs#">#dotlrn.lt_Join_a_clubs_pretty_n#</a>
   </small>
 </p>
 
@@ -46,7 +46,7 @@
 
 <formtemplate id="member_form">
         <th align="left" width="50%">
-          <%= [parameter::get -localize -parameter departments_pretty_name] %>:&nbsp;<formwidget id="member_department_key">
+          @departments_pretty_name@:&nbsp;<formwidget id="member_department_key">
         </th>
         <th align="left" width="50%">
           #dotlrn.Term#&nbsp;<formwidget id="member_term_id">
@@ -58,10 +58,10 @@
 <if @member_classes:rowcount@ gt 0>
     <table cellpadding="0" cellspacing="0" width="100%">
       <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%">#dotlrn.Role#</th>
-        <th align="center" width="15%">#dotlrn.Actions#</th>
+        <th id="name" align="left" width="55%">#dotlrn.class_name_header#</th>
+        <th id="term" align="left" width="15%">#dotlrn.Term#</th>
+        <th id="role" align="left" width="15%">#dotlrn.Role#</th>
+        <th id="actions" align="center" width="15%">#dotlrn.Actions#</th>
       </tr>
 
 <multiple name="member_classes">
@@ -72,14 +72,14 @@
     <else>
       <tr class="even">
     </else>
-        <td><a href="@member_classes.url@">@member_classes.pretty_name@</a></td>
-        <td>@member_classes.term_name@ @member_classes.term_year@</td>
-        <td>@member_classes.role@</td>
+        <td headers="name"><a href="@member_classes.url@" title="#dotlrn.goto_member_classes_pretty_name#">@member_classes.pretty_name@</a></td>
+        <td headers="term">@member_classes.term_name@ @member_classes.term_year@</td>
+        <td headers="role">@member_classes.role@</td>
 <if @member_classes.member_state@ eq "needs approval">
-        <td>[<small> #dotlrn.Pending_Approval# </small>]</td>
+        <td headers="actions">[<small> #dotlrn.Pending_Approval# </small>]</td>
 </if>
 <else>
-        <td>
+        <td headers="actions">
           <if @show_drop_button_p@ eq 1>
             <small><include src="deregister-link" url="@member_classes.url@deregister" referer=@referer@></small></td>
           </if>
@@ -97,9 +97,9 @@
 <if @member_clubs:rowcount@ gt 0>
     <table cellpadding="0" cellspacing="0" width="100%">
       <tr class="table-title">
-        <th align="left" colspan="2" width="70%">#dotlrn.clubs_name_header#</th>
-        <th align="left" width="15%">#dotlrn.Role#</th>
-        <th align="center" width="15%">#dotlrn.Actions#</th>
+        <th id="name" align="left" colspan="2" width="70%">#dotlrn.clubs_name_header#</th>
+        <th id="role" align="left" width="15%">#dotlrn.Role#</th>
+        <th id="actions" align="center" width="15%">#dotlrn.Actions#</th>
       </tr>
 
 <multiple name="member_clubs">
@@ -110,13 +110,13 @@
     <else>
       <tr class="even">
     </else>
-        <td colspan="2"><a href="@member_clubs.url@">@member_clubs.pretty_name@</td>
-        <td>@member_clubs.role@</td>
+        <td headers="name" colspan="2"><a href="@member_clubs.url@" title="#dotlrn.goto_member_clubs_pretty_name#">@member_clubs.pretty_name@</td>
+        <td headers="role">@member_clubs.role@</td>
 <if @member_clubs.member_state@ eq "needs approval">
-        <td>[<small> #dotlrn.Pending_Approval# </small>]</td>
+        <td headers="actions">[<small> #dotlrn.Pending_Approval# </small>]</td>
 </if>
 <else>
-        <td>
+        <td headers="actions">
           <if @show_drop_button_p@ eq 1>
             <small><include src="deregister-link" url="@member_clubs.url@deregister" referer=@referer@></small></td>
           </if>
@@ -142,7 +142,7 @@
 <tr class="table-header">
 <formtemplate id="non_member_form">
         <th align="left" width="50%">
-          <%= [parameter::get -localize -parameter departments_pretty_name] %>:&nbsp;<formwidget id="non_member_department_key">
+          @departments_pretty_name@:&nbsp;<formwidget id="non_member_department_key">
         </th>
         <th align="left" width="50%">
           #dotlrn.Term#&nbsp;<formwidget id="non_member_term_id">
@@ -154,10 +154,11 @@
 <if @non_member_classes:rowcount@ gt 0>
     <table celladding="0" cellspacing="0" width="100%">
       <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%">#dotlrn.Start_date#</th>
-        <th align="center" width="15%">#dotlrn.Actions#</th>
+        <th id="name" align="left" width="25%">#dotlrn.class_name_header#</th>
+	<th id="descrip" align="left" width="30%">#dotlrn.Description#</th>
+        <th id="term" align="left" width="15%">#dotlrn.Term#</th>
+        <th id="startdate" align="left" width="15%">#dotlrn.Start_date#</th>
+        <th id="actions" align="center" width="15%">#dotlrn.Actions#</th>
       </tr>
 
 <multiple name="non_member_classes">
@@ -169,16 +170,21 @@
       <tr class="even">
     </else>
 <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>@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>
+        <td headers="name">
+	  <if @swa_p@ eq 1><a href="@non_member_classes.url@" title="#dotlrn.goto_non_member_classes#">@non_member_classes.pretty_name@</a></if>
+	  <else>@non_member_classes.pretty_name@</else>
+	</td>
+	<td headers="descrip">@non_member_classes.description;noquote@</td>
+        <td headers="term">@non_member_classes.term_name@ @non_member_classes.term_year@</td>
+        <td headers="startdate">@non_member_classes.active_start_date@ - @non_member_classes.active_end_date@</td>
+        <td headers="actions"><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>@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>
+        <td headers="name">@non_member_classes.pretty_name@</td>
+	<td headers="descrip">@non_member_classes.description;noquote@</td>
+        <td headers="term">@non_member_classes.term_name@ @non_member_classes.term_year@</td>
+        <td headers="startdate">@non_member_classes.active_start_date@ - @non_member_classes.active_end_date@</td>
+        <td headers="actions"><small><include src="register-link" community_id="@non_member_classes.community_id@" referer=@referer@ label="Request Membership" ></small></td>
 </else>
       </tr>
 </multiple>
@@ -194,10 +200,10 @@
 <a name="join_club"><p></a>
     <table cellpadding="0" cellspacing="0" width="100%">
       <tr class="table-title">
-        <th align="left" width="55%">#dotlrn.clubs_name_header#</th>
-        <th align="left" width="15%">&nbsp;</th>
-        <th align="left" width="15%">&nbsp;</th>
-        <th align="center">#dotlrn.Actions#</th>
+        <th id="name" align="left" width="25%">#dotlrn.clubs_name_header#</th>
+        <th id="descrip" align="left" width="45%">#dotlrn.Description#</th>
+        <th id="startdate" align="left" width="15%">#dotlrn.Start_date#</th>
+        <th id="actions" align="center" width="15%">#dotlrn.Actions#</th>
       </tr>
 
 <multiple name="non_member_clubs">
@@ -209,16 +215,21 @@
       <tr class="even">
     </else>
 <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_clubs.active_start_date@ - @non_member_clubs.active_end_date@</td>
-        <td><small><include src="register-link" community_id="@non_member_clubs.community_id@" referer=@referer@></small></td>
+        <td headers="name">
+	  <if @swa_p@ eq 1>
+	    <a href="@non_member_clubs.url@" title="#dotlrn.goto_non_member_clubs#">@non_member_clubs.pretty_name@</a>
+	  </if>
+	  <else>@non_member_clubs.pretty_name@</else>
+	</td>
+        <td headers="descrip">@non_member_clubs.description;noquote@</td>
+        <td headers="startdate">@non_member_clubs.active_start_date@ - @non_member_clubs.active_end_date@</td>
+        <td headers="actions"><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_clubs.active_start_date@ - @non_member_clubs.active_end_date@</td>
-        <td><small><include src="register-link" community_id="@non_member_clubs.community_id@"referer=@referer@  label="Request Membership"></small></td>
+        <td headers="name">@non_member_clubs.pretty_name@</td>
+        <td headers="descrip">@non_member_clubs.description;noquote@</td>
+        <td headers="startdate">@non_member_clubs.active_start_date@ - @non_member_clubs.active_end_date@</td>
+        <td headers="actions"><small><include src="register-link" community_id="@non_member_clubs.community_id@"referer=@referer@  label="Request Membership"></small></td>
 </else>
       </tr>
 </multiple>
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.5 -r1.11.2.6
--- openacs-4/packages/dotlrn/www/manage-memberships.tcl	3 Feb 2006 12:36:36 -0000	1.11.2.5
+++ openacs-4/packages/dotlrn/www/manage-memberships.tcl	24 Nov 2006 10:39:39 -0000	1.11.2.6
@@ -73,6 +73,7 @@
              dotlrn_departments_full.department_key
 }]
 set departments [linsert $departments 0 {All ""}]
+set departments_pretty_name [parameter::get -localize -parameter departments_pretty_name]
 
 set terms [db_list_of_lists select_terms_for_select_widget {
     select dotlrn_terms.term_name || ' ' || dotlrn_terms.term_year,
Index: openacs-4/packages/dotlrn/www/register-link.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn/www/register-link.adp,v
diff -u -r1.16 -r1.16.2.1
--- openacs-4/packages/dotlrn/www/register-link.adp	17 May 2004 15:15:02 -0000	1.16
+++ openacs-4/packages/dotlrn/www/register-link.adp	24 Nov 2006 10:39:39 -0000	1.16.2.1
@@ -17,4 +17,17 @@
     #
 
 %>
-<a href="<if @url@ nil>register?community_id=@community_id@&</if><else>@url@?</else><if @referer@ not nil>referer=@referer@</if>"><if @label@ nil>#dotlrn.join_link#</if><else><if @label@ eq "Request Membership">#dotlrn.request_membership_link#</if><else>@label@</else></else></a>
+<a href="
+    <if @url@ nil>register?community_id=@community_id@&</if>
+    <else>@url@?</else>
+    <if @referer@ not nil>referer=@referer@</if>
+    <if @label@ nil>" title="#dotlrn.Join#">#dotlrn.join_link#</if>
+    <else>
+      <if @label@ eq "Request Membership">
+	" title="#dotlrn.Request_Membership#">#dotlrn.request_membership_link#
+      </if>
+      <else>
+	">@label@
+      </else>
+    </else>
+</a>