Index: openacs-4/packages/acs-subsite/www/permissions/grant.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/grant.adp,v
diff -u -r1.1 -r1.2
--- openacs-4/packages/acs-subsite/www/permissions/grant.adp	29 Sep 2003 14:53:37 -0000	1.1
+++ openacs-4/packages/acs-subsite/www/permissions/grant.adp	3 Oct 2003 18:42:47 -0000	1.2
@@ -20,7 +20,8 @@
         <tr>
           <td colspan="@mu_privileges.level@">&nbsp;&nbsp;&nbsp;</td>
           <td colspan="@mu_privileges.inverted_level@">
-            <input type="checkbox" name="privileges" value="@mu_privileges.privilege@" @mu_privileges.selected@>@mu_privileges.privilege@</input>
+            <input type="checkbox" name="privileges" id="@mu_privileges.id@" value="@mu_privileges.privilege@" @mu_privileges.selected@>
+            <label for="@mu_privileges.id@">@mu_privileges.privilege@</label>
           </td>
         </tr>
         </multiple>
Index: openacs-4/packages/acs-subsite/www/permissions/grant.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-subsite/www/permissions/grant.tcl,v
diff -u -r1.5 -r1.6
--- openacs-4/packages/acs-subsite/www/permissions/grant.tcl	29 Sep 2003 14:53:37 -0000	1.5
+++ openacs-4/packages/acs-subsite/www/permissions/grant.tcl	3 Oct 2003 18:42:47 -0000	1.6
@@ -108,7 +108,7 @@
             continue
         } else {
             lappend existing_privs $privilege
-            lappend hierarchy $level $privilege
+            lappend hierarchy [list $level $privilege]
         }
 
         if { $level > $maxlevel } {
@@ -120,17 +120,19 @@
 }
 
 
-multirow create mu_privileges privilege level inverted_level selected
+multirow create mu_privileges privilege level inverted_level selected id
 
 # Preserve checked value of the privilege checkboxes for re-submitted
 # form status.
-foreach { level privilege } $hierarchy {
+
+foreach elm $hierarchy {
+    foreach { level privilege } $elm {}
     if { [info exists privileges] && [lsearch $privileges $privilege]>-1 } {
         set selected "CHECKED"
     } else {
         set selected ""
     }
-    multirow append mu_privileges $privilege $level [expr $maxlevel - $level] $selected
+    multirow append mu_privileges $privilege [expr $level+1] [expr $maxlevel - $level] $selected $privilege
 }
 
 for { set i 0 } { $i < $maxlevel } { incr i } {