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.30.2.1 -r1.30.2.2
--- openacs-4/packages/dotlrn/www/manage-memberships.adp	4 Mar 2007 00:17:38 -0000	1.30.2.1
+++ openacs-4/packages/dotlrn/www/manage-memberships.adp	29 Mar 2007 14:55:40 -0000	1.30.2.2
@@ -41,27 +41,27 @@
 
 <if @n_member_classes@ gt 0>
 
+<formtemplate id="member_form">
     <table cellpadding="0" cellspacing="0"  width="100%">
 <tr class="table-header">
 
-<formtemplate id="member_form">
         <th align="left" width="50%">
           @departments_pretty_name@:&nbsp;<formwidget id="member_department_key">
         </th>
         <th align="left" width="50%">
           #dotlrn.Term#&nbsp;<formwidget id="member_term_id">
         </th>
-</formtemplate>
 </tr>
     </table>
+</formtemplate>
 
 <if @member_classes:rowcount@ gt 0>
     <table cellpadding="0" cellspacing="0" width="100%">
       <tr class="list-header">
-        <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>
+        <th id="class_name" align="left" width="55%">#dotlrn.class_name_header#</th>
+        <th id="class_term" align="left" width="15%">#dotlrn.Term#</th>
+        <th id="class_role" align="left" width="15%">#dotlrn.Role#</th>
+        <th id="class_actions" align="center" width="15%">#dotlrn.Actions#</th>
       </tr>
 
 <multiple name="member_classes">
@@ -72,14 +72,14 @@
     <else>
       <tr class="list-even">
     </else>
-        <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>
+        <td headers="class_name"><a href="@member_classes.url@" title="#dotlrn.goto_member_classes_pretty_name#">@member_classes.pretty_name@</a></td>
+        <td headers="class_term">@member_classes.term_name@ @member_classes.term_year@</td>
+        <td headers="class_role">@member_classes.role@</td>
 <if @member_classes.member_state@ eq "needs approval">
-        <td headers="actions">[<small> #dotlrn.Pending_Approval# </small>]</td>
+        <td headers="class_actions">[<small> #dotlrn.Pending_Approval# </small>]</td>
 </if>
 <else>
-        <td headers="actions">
+        <td headers="class_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="list-header">
-        <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>
+        <th id="club_name" align="left" colspan="2" width="70%">#dotlrn.clubs_name_header#</th>
+        <th id="club_role" align="left" width="15%">#dotlrn.Role#</th>
+        <th id="club_actions" align="center" width="15%">#dotlrn.Actions#</th>
       </tr>
 
 <multiple name="member_clubs">
@@ -110,13 +110,13 @@
     <else>
       <tr class="list-even">
     </else>
-        <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>
+        <td headers="club_name" colspan="2"><a href="@member_clubs.url@" title="#dotlrn.goto_member_clubs_pretty_name#">@member_clubs.pretty_name@</a></td>
+        <td headers="club_role">@member_clubs.role@</td>
 <if @member_clubs.member_state@ eq "needs approval">
-        <td headers="actions">[<small> #dotlrn.Pending_Approval# </small>]</td>
+        <td headers="club_actions">[<small> #dotlrn.Pending_Approval# </small>]</td>
 </if>
 <else>
-        <td headers="actions">
+        <td headers="club_actions">
           <if @show_drop_button_p@ eq 1>
             <small><include src="deregister-link" url="@member_clubs.url@deregister" referer=@referer@></small></td>
           </if>
@@ -138,27 +138,27 @@
 
 <if @n_non_member_classes@ gt 0>
 
+<formtemplate id="non_member_form">
     <table cellpadding="0" cellspacing="0" width="100%">
 <tr class="table-header">
-<formtemplate id="non_member_form">
         <th align="left" width="50%">
           @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">
         </th>
-</formtemplate>
 </tr>
     </table>
+</formtemplate>
 
 <if @non_member_classes:rowcount@ gt 0>
     <table celladding="0" cellspacing="0" width="100%">
       <tr class="list-header">
-        <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>
+        <th id="non_class_name" align="left" width="25%">#dotlrn.class_name_header#</th>
+	<th id="non_class_descrip" align="left" width="30%">#dotlrn.Description#</th>
+        <th id="non_class_term" align="left" width="15%">#dotlrn.Term#</th>
+        <th id="non_class_startdate" align="left" width="15%">#dotlrn.Start_date#</th>
+        <th id="non_class_actions" align="center" width="15%">#dotlrn.Actions#</th>
       </tr>
 
 <multiple name="non_member_classes">
@@ -170,21 +170,21 @@
       <tr class="list-even">
     </else>
 <if @non_member_classes.join_policy@ eq "open">
-        <td headers="name">
+        <td headers="non_class_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>
+	<td headers="non_class_descrip">@non_member_classes.description;noquote@</td>
+        <td headers="non_class_term">@non_member_classes.term_name@ @non_member_classes.term_year@</td>
+        <td headers="non_class_startdate">@non_member_classes.active_start_date@ - @non_member_classes.active_end_date@</td>
+        <td headers="non_class_actions"><small><include src="register-link" community_id="@non_member_classes.community_id@" referer=@referer@></small></td>
 </if>
 <else>
-        <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>
+        <td headers="non_class_name">@non_member_classes.pretty_name@</td>
+	<td headers="non_class_descrip">@non_member_classes.description;noquote@</td>
+        <td headers="non_class_term">@non_member_classes.term_name@ @non_member_classes.term_year@</td>
+        <td headers="non_class_startdate">@non_member_classes.active_start_date@ - @non_member_classes.active_end_date@</td>
+        <td headers="non_class_actions"><small><include src="register-link" community_id="@non_member_classes.community_id@" referer=@referer@ label="Request Membership" ></small></td>
 </else>
       </tr>
 </multiple>
@@ -197,13 +197,13 @@
 </if>
 
 <if @non_member_clubs:rowcount@ gt 0>
-<a name="join_club"><p></a>
+<a name="join_club"></a>
     <table cellpadding="0" cellspacing="0" width="100%">
       <tr class="list-header">
-        <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>
+        <th id="non_club_name" align="left" width="25%">#dotlrn.clubs_name_header#</th>
+        <th id="non_club_descrip" align="left" width="45%">#dotlrn.Description#</th>
+        <th id="non_club_startdate" align="left" width="15%">#dotlrn.Start_date#</th>
+        <th id="non_club_actions" align="center" width="15%">#dotlrn.Actions#</th>
       </tr>
 
 <multiple name="non_member_clubs">
@@ -215,21 +215,21 @@
       <tr class="list-even">
     </else>
 <if @non_member_clubs.join_policy@ eq "open">
-        <td headers="name">
+        <td headers="non_club_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>
+        <td headers="non_club_descrip">@non_member_clubs.description;noquote@</td>
+        <td headers="non_club_startdate">@non_member_clubs.active_start_date@ - @non_member_clubs.active_end_date@</td>
+        <td headers="non_club_actions"><small><include src="register-link" community_id="@non_member_clubs.community_id@" referer=@referer@></small></td>
 </if>
 <else>
-        <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>
+        <td headers="non_club_name">@non_member_clubs.pretty_name@</td>
+        <td headers="non_club_descrip">@non_member_clubs.description;noquote@</td>
+        <td headers="non_club_startdate">@non_member_clubs.active_start_date@ - @non_member_clubs.active_end_date@</td>
+        <td headers="non_club_actions"><small><include src="register-link" community_id="@non_member_clubs.community_id@"referer=@referer@  label="Request Membership"></small></td>
 </else>
       </tr>
 </multiple>