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.23.6.4 -r1.23.6.5
--- openacs-4/packages/dotlrn/www/manage-memberships.adp	22 Jul 2004 16:24:49 -0000	1.23.6.4
+++ openacs-4/packages/dotlrn/www/manage-memberships.adp	26 Jul 2004 10:00:51 -0000	1.23.6.5
@@ -97,7 +97,7 @@
 <if @member_clubs:rowcount@ gt 0>
     <table cellpadding="0" cellspacing="0" width="100%">
       <tr class="table-title">
-        <th align="left" width="70%">#dotlrn.clubs_name_header#</th>
+        <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>
       </tr>
@@ -110,13 +110,16 @@
     <else>
       <tr class="even">
     </else>
-        <td><a href="@member_clubs.url@">@member_clubs.pretty_name@</td>
+        <td colspan="2"><a href="@member_clubs.url@">@member_clubs.pretty_name@</td>
         <td>@member_clubs.role@</td>
 <if @member_clubs.member_state@ eq "needs approval">
         <td>[<small> #dotlrn.Pending_Approval# </small>]</td>
 </if>
 <else>
-        <td align=center><small><include src="deregister-link" url="@member_clubs.url@deregister" referer=@referer@></small></td>
+        <td>
+          <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>
@@ -184,79 +187,42 @@
 
 </if>
 
+<if @non_member_clubs:rowcount@ gt 0>
 <a name="join_club"><p></a>
     <table cellpadding="0" cellspacing="0" width="100%">
       <tr class="table-title">
-        <th align="left" width="70%">#dotlrn.clubs_name_header#</th>
+        <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>
       </tr>
-      <tr class="odd">
-      <td colspan="3"><b>EABIS Main<b></td>
-      </tr>
-	<tr class="even">
-	      <td>&nbsp;&nbsp;&nbsp; EABIS Main</td>
-	      <td>&nbsp;</td>
-	      <td align="center"><small><include src="register-link"
-    community_id="2306" referer=@referer@
-    label="Request Membership"></small></td>		
-        </tr>		   
-	<tr class="even">
-	      <td>&nbsp;&nbsp;&nbsp; Management Committee</td>
-	      <td>&nbsp;</td>
-	      <td align="center"><small><include src="register-link"
-    community_id="4699" referer=@referer@
-    label="Request Membership"></small></td>		
-        </tr>		   
 
-	<tr class="even">
-	      <td>&nbsp;&nbsp;&nbsp; Central Coordination Team</td>
-	      <td>&nbsp;</td>
-	      <td align="center"><small><include src="register-link"
-    community_id="2707" referer=@referer@
-    label="Request Membership"></small></td>		
-        </tr>		   
-      <tr class="odd">
-      <td colspan="3"><b>Business Network</b></td>
-      </tr>
+<multiple name="non_member_clubs">
 
+    <if @non_member_clubs.rownum@ odd>
       <tr class="odd">
-      <td colspan="3"><b>Academic Network</b></td>
+    </if>
+    <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><small><include src="register-link" community_id="@non_member_clubs.community_id@" referer=@referer@></small></td>
+</if>
+<else>
+        <td><small><include src="register-link" community_id="@non_member_clubs.community_id@"referer=@referer@  label="Request Membership"></small></td>
+</else>
       </tr>
-
-      <tr class="odd">
-      <td colspan="3"><b>Research</b></td>
-      </tr>
-	<tr class="even">
-	      <td>&nbsp;&nbsp;&nbsp; PhD Network</td>
-	      <td>&nbsp;</td>
-	      <td align="center"><small><include src="register-link"
-    community_id="3459" referer=@referer@
-    label="Request Membership"></small></td>		
-        </tr>		   
-	<tr class="even">
-	      <td>&nbsp;&nbsp;&nbsp; RESPONSE</td>
-	      <td>&nbsp;</td>
-	      <td align="center"><small><include src="register-link"
-    community_id="6201" referer=@referer@
-    label="Request Membership"></small></td>		
-        </tr>		   
-
-      <tr class="odd">
-      <td colspan="3"><b>Education</b></td>
-      </tr>
-      <tr class="odd">
-      <td colspan="3"><b>Training</b></td>
-      </tr>
-
-
+</multiple>
     </table>
 
+</if>
+<else>
+  <p><small>#dotlrn.no_clubs#</small></p>
+</else>
 
 </if>
-<p>
 
 
-
-
-