Index: openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp,v
diff -u -N -r1.37 -r1.37.2.1
--- openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp	6 Jul 2007 12:13:24 -0000	1.37
+++ openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp	17 Aug 2008 03:15:43 -0000	1.37.2.1
@@ -18,40 +18,44 @@
 
 %>
 
-<if @dotlrn_admin_p@ eq 1>
+
+<comment>Group properties section</comment>
+
 <ul>
-  <li><a href="@dotlrn_admin_url@" title="#dotlrn-portlet.goto_admin_pretty_name#">@admin_pretty_name@</a></li>
-  <li><a href="dotlrn-group-admin-faq" title="#dotlrn-portlet.goto_Administrator_FAQ#">#dotlrn-portlet.Administrator_FAQ#</a></li>
-  <li><a href="clone" title="#dotlrn-portlet.Copy_this_group#">#dotlrn-portlet.Copy_this_group#</a></li>
-  <if @archived_p@ eq t>
-  <li><a href="@dotlrn_admin_url@/archived-communities" title="#dotlrn-portlet.goto_archived_communities#"><font color=red>#dotlrn-portlet.lt_This_group_is_archive#</font></a></li>
-  </if>
-  <else>
-    <li><a href="subcommunity-archive" title="#dotlrn-portlet.Archive_this_group#">#dotlrn-portlet.Archive_this_group#</a></li>
-  </else>
-   <if @club_p@ eq 0>
-     <li><a href="class-term-change?pretty_name=@pretty_name;noquote@" title="#dotlrn-portlet.Change_term_of_pretty_name#">#dotlrn-portlet.Change_term#</a></li>
-   </if>
-   <li>
-    #dotlrn-portlet.lt_Guests_Can_View_Membership_Info# -
-      <if @guests_can_view_private_data_p@><b>#acs-kernel.common_yes#</b>&nbsp;|&nbsp;<a href="privacy-policy-toggle?policy=no" title="#dotlrn-portlet.Toggle_privacy_policy_to_no#">#acs-kernel.common_No#</a></if><else><a href="privacy-policy-toggle?policy=yes" title="#dotlrn-portlet.Toggle_privacy_policy_to_yes#">#acs-kernel.common_Yes#</a>&nbsp;|&nbsp;<b>#acs-kernel.common_no#</b></else>
+  <li><a href="community-edit" title="#dotlrn-portlet.edit_gr_props#">#dotlrn-portlet.edit_gr_props#</a> - #dotlrn-portlet.change_name_etc#
+    <ul>
+<if @customize_portal_layout_p@ eq 1 or @dotlrn_admin_p@ eq 1 >
+      <li><a href="one-community-portal-configure" title="#dotlrn-portlet.lt_Customize_Portal_Layo#">#dotlrn-portlet.lt_Customize_Portal_Layo#</a></li>
+      <li><a href="element-list" title="#dotlrn-portlet.lt_Change_Name_Portlet#">#dotlrn-portlet.lt_Change_Name_Portlet#</a></li>
+</if>
+      <li><a href="change-site-template?referer=@referer@" title="#dotlrn.Customize_Template#">#dotlrn.Customize_Template#</a></li>
+      <li>
+        #dotlrn-portlet.lt_Change_Bulk_Mail_Poli# -
+          <if @members_can_spam_p@ true><b>#dotlrn-portlet.All_members#</b></if><else><a href="spam-policy-toggle?policy=all" title="#dotlrn-portlet.change_bm_policy_to_all_members#">#dotlrn-portlet.All_members#</a></else>
+          | <if @members_can_spam_p@ false><b>#dotlrn-portlet.Only_admins#</b></if><else><a href="spam-policy-toggle?policy=admins" title="#dotlrn-portlet.change_bm_policy_to_only_admins#">#dotlrn-portlet.Only_admins#</a></else>
+          #dotlrn-portlet.lt_can_send_bulk_mail_to#
+      </li>
+    </ul>
   </li>
 </ul>
-</if>
 
+<comment>Membership section</comment>
+
 <ul>
 <if @manage_membership_p@ eq 1 or @dotlrn_admin_p@ eq 1 >
-     <li><a href="members" title="#dotlrn-portlet.goto_Manage_Membership#">#dotlrn-portlet.Manage_Membership#</a> - #dotlrn-portlet.lt_AddRemove_pretty_name#</li>
-     <if @member_email_enabled_p@ defined>
-       <li><a href="member-email" title="#dotlrn-portlet.Edit_Welcome_Message#">#dotlrn-portlet.Edit_Welcome_Message#</a>
+  <li><a href="members" title="#dotlrn-portlet.goto_Manage_Membership#">#dotlrn-portlet.Manage_Membership#</a> - #dotlrn-portlet.lt_AddRemove_pretty_name#
+    <ul>
+    <if @member_email_enabled_p@ defined>
+      <li><a href="member-email" title="#dotlrn-portlet.Edit_Welcome_Message#">#dotlrn-portlet.Edit_Welcome_Message#</a>
        - <if @member_email_enabled_p@ eq "t"><b>#acs-subsite.Enabled#</b></if>
          <else><a href="member-email-toggle" title="#dotlrn-portlet.enable_welcome_message#">#acs-subsite.Enabled#</a></else> |
          <if @member_email_enabled_p@ ne "t"><b>#acs-subsite.Disabled#</b></if>
          <else><a href="member-email-toggle" title="#dotlrn-portlet.disable_welcome_message#">#acs-subsite.Disabled#</a></else>
-     </if>
-     <else>
-       <li><a href="member-email" title="#dotlrn-portlet.lt_Create_Welcome_Messag#">#dotlrn-portlet.lt_Create_Welcome_Messag#</a>
-     </else></li>
+    </if>
+    <else>
+      <li><a href="member-email" title="#dotlrn-portlet.lt_Create_Welcome_Messag#">#dotlrn-portlet.lt_Create_Welcome_Messag#</a>
+    </else>
+      </li>
 </if>
 
 <if @enrollment_policy_p@ eq 1 or @dotlrn_admin_p@ eq 1 >
@@ -62,26 +66,7 @@
         |&nbsp;<if @join_policy@ eq "needs approval"><b>#dotlrn-portlet.Needs_Approval#</b></if><else><a href="join-policy-toggle?policy=needs%20approval" title="#dotlrn-portlet.set_policy_approval#">#dotlrn-portlet.Needs_Approval#</a></else>
       </li>
 </if>
-</ul>
-
-<ul>
-<if @customize_portal_layout_p@ eq 1 or @dotlrn_admin_p@ eq 1 >
-  <li><a href="one-community-portal-configure" title="#dotlrn-portlet.lt_Customize_Portal_Layo#">#dotlrn-portlet.lt_Customize_Portal_Layo#</a></li>
-  <li><a href="element-list" title="#dotlrn-portlet.lt_Change_Name_Portlet#">#dotlrn-portlet.lt_Change_Name_Portlet#</a></li>
-</if>
- <li><a href="change-site-template?referer=@referer@" title="#dotlrn.Customize_Template#">#dotlrn.Customize_Template#</a></li>
-      <li>
-        #dotlrn-portlet.lt_Change_Bulk_Mail_Poli# -
-          <if @members_can_spam_p@ true><b>#dotlrn-portlet.All_members#</b></if><else><a href="spam-policy-toggle?policy=all" title="#dotlrn-portlet.change_bm_policy_to_all_members#">#dotlrn-portlet.All_members#</a></else>
-          | <if @members_can_spam_p@ false><b>#dotlrn-portlet.Only_admins#</b></if><else><a href="spam-policy-toggle?policy=admins" title="#dotlrn-portlet.change_bm_policy_to_only_admins#">#dotlrn-portlet.Only_admins#</a></else>
-          #dotlrn-portlet.lt_can_send_bulk_mail_to#
-      </li>
-  <li><a href="community-edit" title="#dotlrn-portlet.edit_gr_props#">#dotlrn-portlet.edit_gr_props#</a> - #dotlrn-portlet.change_name_etc#</li>
-</ul>
-
 <if @subcommunity_p@ eq 0>
-<ul>
-
   <if @club_p@ eq 0>
     <if @create_limited_user_p@ eq 1 or @dotlrn_admin_p@ eq 1 >
       <li>
@@ -93,13 +78,16 @@
    <if @create_guest_user_p@ eq 1 or @dotlrn_admin_p@ eq 1 >
       <li><a href="@club_limited_user_add_url@" title="#dotlrn-portlet.lt_Create_a_new_Limited__1#">#dotlrn-portlet.lt_Create_a_new_Limited__1#</a>
         - #dotlrn-portlet.lt_Only_use_this_to_crea_1#
-     </li>
+      </li>
    </if>
-</ul>
 </if>
+    </ul>
+  </li>
+</ul>
 
-<ul>
+<comment>subgroups section</comment>
 
+<ul>
   <li>@sub_pretty_plural@
     <ul>
 <multiple name="subgroups">
@@ -112,13 +100,39 @@
         ]</nobr>
       </li>
 </multiple>
-	<li><p><a href="subcommunity-new" title="#dotlrn-portlet.New_sub_pretty_name#">#dotlrn-portlet.New_sub_pretty_name#</a></p></li>
-      </ul>
+      <li><p><a href="subcommunity-new" title="#dotlrn-portlet.New_sub_pretty_name#">#dotlrn-portlet.New_sub_pretty_name#</a></p></li>
+    </ul>
   </li>
-  </ul>
+</ul>
 
+<comment>manage applets section </comment>
 <if @manage_applets_p@ eq 1 or @dotlrn_admin_p@ eq 1 >
 <ul>
   <li><a href="applets" title="#dotlrn-portlet.Manage_Applets#">#dotlrn-portlet.Manage_Applets#</a></li>
 </ul>
 </if>
+
+<comment>.LRN admin actions section</comment>
+<if @dotlrn_admin_p@ eq 1>
+<ul>
+  <li><a href="@dotlrn_admin_url@" title="#dotlrn-portlet.goto_admin_pretty_name#">@admin_pretty_name@</a>
+    <ul>
+      <li><a href="dotlrn-group-admin-faq" title="#dotlrn-portlet.goto_Administrator_FAQ#">#dotlrn-portlet.Administrator_FAQ#</a></li>
+      <li><a href="clone" title="#dotlrn-portlet.Copy_this_group#">#dotlrn-portlet.Copy_this_group#</a></li>
+  <if @archived_p@ eq t>
+      <li><a href="@dotlrn_admin_url@/archived-communities" title="#dotlrn-portlet.goto_archived_communities#"><font color=red>#dotlrn-portlet.lt_This_group_is_archive#</font></a></li>
+  </if>
+  <else>
+      <li><a href="subcommunity-archive" title="#dotlrn-portlet.Archive_this_group#">#dotlrn-portlet.Archive_this_group#</a></li>
+  </else>
+  <if @club_p@ eq 0>
+      <li><a href="class-term-change?pretty_name=@pretty_name;noquote@" title="#dotlrn-portlet.Change_term_of_pretty_name#">#dotlrn-portlet.Change_term#</a></li>
+  </if>
+      <li>
+        #dotlrn-portlet.lt_Guests_Can_View_Membership_Info# -
+  <if @guests_can_view_private_data_p@><b>#acs-kernel.common_yes#</b>&nbsp;|&nbsp;<a href="privacy-policy-toggle?policy=no" title="#dotlrn-portlet.Toggle_privacy_policy_to_no#">#acs-kernel.common_No#</a></if><else><a href="privacy-policy-toggle?policy=yes" title="#dotlrn-portlet.Toggle_privacy_policy_to_yes#">#acs-kernel.common_Yes#</a>&nbsp;|&nbsp;<b>#acs-kernel.common_no#</b></else>
+      </li>
+    </ul>
+  </li>
+</ul>
+</if>