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 -N -r1.30 -r1.31
--- openacs-4/packages/dotlrn/www/manage-memberships.adp	15 Dec 2006 22:45:22 -0000	1.30
+++ openacs-4/packages/dotlrn/www/manage-memberships.adp	4 Mar 2007 19:57:12 -0000	1.31
@@ -26,7 +26,7 @@
 
 <p>
   <small>
-    <a href="#current_clubs" title="#dotlrn.goto_current_clubs#">#dotlrn.lt_Current_clubs_pretty_#</a>
+    <a href="#current" title="#dotlrn.goto_current_clubs#">#dotlrn.lt_Current_clubs_pretty_#</a>
     |
     <a href="#join_classes" title="#dotlrn.goto_join_class#">#dotlrn.lt_Join_a_class_instance#</a>
     |
@@ -36,210 +36,62 @@
 
 <if @n_member_classes@ gt 0 or @member_clubs:rowcount@ gt 0>
   <hr>
+  <h2><a name="current">#dotlrn.lt_Your_Current_Membersh#</a></h2>
 
-  <h4><a name="current">#dotlrn.lt_Your_Current_Membersh#</a></h4>
-
 <if @n_member_classes@ gt 0>
-
-    <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>
+</if>
 
 <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>
-      </tr>
-
-<multiple name="member_classes">
-
-    <if @member_classes.rownum@ odd>
-      <tr class="list-odd">
-    </if>
-    <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>
-<if @member_classes.member_state@ eq "needs approval">
-        <td headers="actions">[<small> #dotlrn.Pending_Approval# </small>]</td>
+<listtemplate name="member_classes"></listtemplate>
 </if>
 <else>
-        <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>
-</else>
-      </tr>
-</multiple>
-    </table>
-</if>
-<else>
   <small>#dotlrn.No_classes#</small>
 </else>
 
 </if>
 
 <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>
-      </tr>
-
-<multiple name="member_clubs">
-
-    <if @member_clubs.rownum@ odd>
-      <tr class="list-odd">
-    </if>
-    <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>
-<if @member_clubs.member_state@ eq "needs approval">
-        <td headers="actions">[<small> #dotlrn.Pending_Approval# </small>]</td>
+<listtemplate name="member_clubs"></listtemplate>
 </if>
 <else>
-        <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>
-</else>
-      </tr>
-</multiple>
-    </table>
-</if>
-<else>
   <p><small>#dotlrn.no_clubs#</small></p>
 </else>
 
 </if>
 
 <if @n_non_member_classes@ gt 0 or @non_member_clubs:rowcount@ gt 0>
 <hr>
+  <h4>#dotlrn.Join_A_Group#</h4>
 
-  <h4><a name="join_class">#dotlrn.Join_A_Group#</a></h4>
-
 <if @n_non_member_classes@ gt 0>
-
-    <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>
 
+<a name="join_classes"><p></a>
 <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>
-      </tr>
-
-<multiple name="non_member_classes">
-
-    <if @non_member_classes.rownum@ odd>
-      <tr class="list-odd">
-    </if>
-    <else>
-      <tr class="list-even">
-    </else>
-<if @non_member_classes.join_policy@ eq "open">
-        <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>
+<listtemplate name="non_member_classes"></listtemplate>
 </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>
-</else>
-      </tr>
-</multiple>
-    </table>
-</if>
-<else>
   <small>#dotlrn.No_classes#</small>
 </else>
 
 </if>
 
+<a name="join_clubs"><p></a>
 <if @non_member_clubs:rowcount@ gt 0>
-<a name="join_club"><p></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>
-      </tr>
-
-<multiple name="non_member_clubs">
-
-    <if @non_member_clubs.rownum@ odd>
-      <tr class="list-odd">
-    </if>
-    <else>
-      <tr class="list-even">
-    </else>
-<if @non_member_clubs.join_policy@ eq "open">
-        <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>
+<listtemplate name="non_member_clubs"></listtemplate>
 </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>
-</else>
-      </tr>
-</multiple>
-    </table>
-
-</if>
-<else>
   <p><small>#dotlrn.no_clubs#</small></p>
 </else>
 
 </if>
 
 
+