From 65d3dc0ec33fd76229dc02536a74ccac5408876b Mon Sep 17 00:00:00 2001
From: "bugreport%peshkin.net" <>
Date: Mon, 23 Sep 2002 00:14:48 +0000
Subject: bug 157756 - Groups_20020716_Branch Tracking : > 55 groups now
 supported r=bbaetz, gerv

---
 .../en/default/account/prefs/permissions.html.tmpl | 34 +++++++++++++++-------
 template/en/default/global/useful-links.html.tmpl  |  2 +-
 template/en/default/sidebar.xul.tmpl               |  2 +-
 3 files changed, 25 insertions(+), 13 deletions(-)

(limited to 'template')

diff --git a/template/en/default/account/prefs/permissions.html.tmpl b/template/en/default/account/prefs/permissions.html.tmpl
index 15bca6deb..064220d6e 100644
--- a/template/en/default/account/prefs/permissions.html.tmpl
+++ b/template/en/default/account/prefs/permissions.html.tmpl
@@ -20,36 +20,48 @@
   #%]
 
 [%# INTERFACE:
-  # has_bits: array of strings. May be empty.
-  #           Descriptions of the permission bits the user has. 
-  # set_bits: array of strings. May be empty. 
-  #           Descriptions of the permission bits the user can set for 
+  # has_bits: array of hashes. May be empty.
+  #           name => Names of the permissions the user has. 
+  #           desc => Descriptions of the permissions the user has. 
+  # set_bits: array of hashes. May be empty. 
+  #           name => Names of the permissions the user can set for 
+  #           other people.
+  #           desc => Descriptions of the permissions the user can set for 
   #           other people.
   #%]
  
-<table>
+<table align="center">
   <tr>
     <td>
       [% IF has_bits.size %]
         You have the following permission bits set on your account:
-        <ul>
+        <p>
+        <br>
+        <table align="center">
           [% FOREACH bit_description = has_bits %]
-            <li>[% bit_description %]</li>
+            <tr>
+              <td>[% bit_description.name %]</td>
+              <td>[% bit_description.desc %]</td>
+            </tr>
           [% END %]
-        </ul>
+        </table>
       [% ELSE %]
         There are no permission bits set on your account.
       [% END %]
 
       [% IF set_bits.size %]
+        <br>
         And you can turn on or off the following bits for
         <a href="editusers.cgi">other users</a>:
         <p>
-          <ul>
+          <table align="center">
           [% FOREACH bit_description = set_bits %]
-            <li>[% bit_description %]</li>
+            <tr>
+              <td>[% bit_description.name %]</td>
+              <td>[% bit_description.desc %]</td>
+            </tr>
           [% END %]
-          </ul>
+          </table>
         </p>
       [% END %]
     </td>
diff --git a/template/en/default/global/useful-links.html.tmpl b/template/en/default/global/useful-links.html.tmpl
index 987ca370b..1e5b09df1 100644
--- a/template/en/default/global/useful-links.html.tmpl
+++ b/template/en/default/global/useful-links.html.tmpl
@@ -65,7 +65,7 @@
         [% ', <a href="editparams.cgi">parameters</a>' 
                                                    IF user.groups.tweakparams %]
         [% ', <a href="editusers.cgi">users</a>'     IF user.groups.editusers 
-                                                  || (user.blessgroupset > 0) %]
+                                                  || user.canblessany %]
         [% ', <a href="editproducts.cgi">products</a>' 
                                                 IF user.groups.editcomponents %]
         [% ', <a href="editattachstatuses.cgi"> attachment&nbsp;statuses</a>'
diff --git a/template/en/default/sidebar.xul.tmpl b/template/en/default/sidebar.xul.tmpl
index ad7158b13..21a07c998 100644
--- a/template/en/default/sidebar.xul.tmpl
+++ b/template/en/default/sidebar.xul.tmpl
@@ -73,7 +73,7 @@ function normal_keypress_handler( aEvent ) {
   [%- IF UserInGroup('tweakparams') %]
       <text class="text-link" onclick="load_relative_url('editparams.cgi')" value="edit params"/>
   [%- END %]
-  [%- IF UserInGroup('editusers') || blessgroupset %]
+  [%- IF UserInGroup('editusers') || canblessany %]
       <text class="text-link" onclick="load_relative_url('editusers.cgi')" value="edit users"/>
   [%- END %]
   [%- IF UserInGroup('editcomponents') %]
-- 
cgit v1.2.3-24-g4f1b