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 -r1.39 -r1.39.4.1
--- openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp	16 Sep 2013 11:07:45 -0000	1.39
+++ openacs-4/packages/dotlrn-portlet/www/dotlrn-admin-portlet.adp	18 Jul 2016 11:53:58 -0000	1.39.4.1
@@ -24,15 +24,15 @@
 <ul>
   <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 >
+<if @customize_portal_layout_p@ true or @dotlrn_admin_p@ true >
       <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>
+          <if @members_can_spam_p@ true><strong>#dotlrn-portlet.All_members#</strong></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><strong>#dotlrn-portlet.Only_admins#</strong></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>
@@ -42,14 +42,14 @@
 <comment>Membership section</comment>
 
 <ul>
-<if @manage_membership_p@ eq 1 or @dotlrn_admin_p@ eq 1 >
+<if @manage_membership_p@ true or @dotlrn_admin_p@ true >
   <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>
+       - <if @member_email_enabled_p@ true"><strong>#acs-subsite.Enabled#</strong></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>
+         <if @member_email_enabled_p@ false><strong>#acs-subsite.Disabled#</strong></if>
          <else><a href="member-email-toggle" title="#dotlrn-portlet.disable_welcome_message#">#acs-subsite.Disabled#</a></else>
     </if>
     <else>
@@ -58,24 +58,24 @@
       </li>
 </if>
 
-<if @enrollment_policy_p@ eq 1 or @dotlrn_admin_p@ eq 1 >
+<if @enrollment_policy_p@ true or @dotlrn_admin_p@ true >
       <li>
         #dotlrn-portlet.lt_Change_Enrollment_Pol# -
-          <if @join_policy@ eq "open"><b>#dotlrn-portlet.Open#</b></if><else><a href="join-policy-toggle?policy=open" title="#dotlrn-portlet.set_policy_open#">#dotlrn-portlet.Open#</a></else>
-        | <if @join_policy@ eq "closed"><b>#dotlrn-portlet.Closed#</b></if><else><a href="join-policy-toggle?policy=closed" title="#dotlrn-portlet.set_policy_closed#">#dotlrn-portlet.Closed#</a></else>
-        |&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>
+          <if @join_policy@ eq "open"><strong>#dotlrn-portlet.Open#</strong></if><else><a href="join-policy-toggle?policy=open" title="#dotlrn-portlet.set_policy_open#">#dotlrn-portlet.Open#</a></else>
+        | <if @join_policy@ eq "closed"><strong>#dotlrn-portlet.Closed#</strong></if><else><a href="join-policy-toggle?policy=closed" title="#dotlrn-portlet.set_policy_closed#">#dotlrn-portlet.Closed#</a></else>
+        |&nbsp;<if @join_policy@ eq "needs approval"><strong>#dotlrn-portlet.Needs_Approval#</strong></if><else><a href="join-policy-toggle?policy=needs%20approval" title="#dotlrn-portlet.set_policy_approval#">#dotlrn-portlet.Needs_Approval#</a></else>
       </li>
 </if>
-<if @subcommunity_p@ eq 0>
-  <if @club_p@ eq 0>
-    <if @create_limited_user_p@ eq 1 or @dotlrn_admin_p@ eq 1 >
+<if @subcommunity_p@ false>
+  <if @club_p@ false>
+    <if @create_limited_user_p@ true or @dotlrn_admin_p@ true >
       <li>
         <a href="@limited_user_add_url@" title="#dotlrn-portlet.lt_Create_a_new_Limited_#">#dotlrn-portlet.lt_Create_a_new_Limited_#</a> - #dotlrn-portlet.lt_Only_use_this_to_crea# </li>
       </if>
    </if>
 
 
-   <if @create_guest_user_p@ eq 1 or @dotlrn_admin_p@ eq 1 >
+   <if @create_guest_user_p@ true or @dotlrn_admin_p@ true >
       <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>
@@ -106,31 +106,31 @@
 </ul>
 
 <comment>manage applets section </comment>
-<if @manage_applets_p@ eq 1 or @dotlrn_admin_p@ eq 1 >
+<if @manage_applets_p@ true or @dotlrn_admin_p@ true >
 <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>
+<if @dotlrn_admin_p@ true>
 <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>
+  <if @archived_p@ true>
       <li><a href="@dotlrn_admin_url@/archived-communities" title="#dotlrn-portlet.goto_archived_communities#"><span style="color:red">#dotlrn-portlet.lt_This_group_is_archive#</span></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>
+  <if @club_p@ false>
       <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>
+  <if @guests_can_view_private_data_p@ true><strong>#acs-kernel.common_yes#</strong>&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;<strong>#acs-kernel.common_no#</strong></else>
       </li>
     </ul>
   </li>