Index: trunk/kernel/admin_templates/groups/groups_edit_permissions.tpl
===================================================================
diff -u -r4603 -r4607
--- trunk/kernel/admin_templates/groups/groups_edit_permissions.tpl	(.../groups_edit_permissions.tpl)	(revision 4603)
+++ trunk/kernel/admin_templates/groups/groups_edit_permissions.tpl	(.../groups_edit_permissions.tpl)	(revision 4607)
@@ -60,32 +60,69 @@
 
 <inp2:g_SaveWarning name="grid_save_warning"/>
 
-<inp2:m_DefineElement name="permission_element">
+<inp2:m_DefineElement name="permission_element" prefix="g-perm">
 	<td>
-		[x] <inp2:m_param name="perm_name"/>
+		<inp2:$prefix_HasPermission perm_name="$perm_name" section_name="$section_name">
+	 		<input type="hidden" id="<inp2:m_param name="prefix"/>[<inp2:m_param name="section_name"/>][<inp2:m_param name="perm_name"/>]" name="<inp2:m_param name="prefix"/>[<inp2:m_param name="section_name"/>][<inp2:m_param name="perm_name"/>]" value="<inp2:$prefix_PermissionValue section_name="$section_name" perm_name="$perm_name"/>">
+			<input type="checkbox" align="absmiddle" id="_cb_<inp2:m_param name="prefix"/>[<inp2:m_param name="section_name"/>][<inp2:m_param name="perm_name"/>]" name="_cb_<inp2:m_param name="prefix"/>[<inp2:m_param name="section_name"/>][<inp2:m_param name="perm_name"/>]" <inp2:m_if check="{$prefix}_PermissionValue" section_name="$section_name" perm_name="$perm_name" value="1">checked</inp2:m_if> onchange="update_checkbox(this, document.getElementById('<inp2:m_param name="prefix"/>[<inp2:m_param name="section_name"/>][<inp2:m_param name="perm_name"/>]'));">
+ 		<inp2:m_else/>
+ 			&nbsp;
+ 		</inp2:m_if>
 	</td>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="tree_element">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>" id="adm[0][<inp2:m_param name="section_name"/>]">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 	 	<td>
-	 		<img src="<inp2:$SectionPrefix_ModulePath/>img/icons/icon24_<inp2:m_param name="icon"/>.gif" border="0" alt="<inp2:m_phrase name="$label"/>" align="absmiddle"/>
-	 		<inp2:m_phrase name="$label"/>
+	 		<img src="img/spacer.gif" height="1" width="<inp2:g-perm_LevelIndicator level="$deep_level" multiply="20"/>" alt="" border="0"/>
+	 		
+	 		<img src="<inp2:$SectionPrefix_ModulePath/>img/icons/icon24_<inp2:m_param name="icon"/>.gif" border="0" alt="" title="" align="absmiddle"/>
+	 		<inp2:m_if check="m_ParamEquals" name="children_count" value="0">
+	 			<inp2:m_phrase name="$label"/>
+	 		<inp2:m_else/>
+	 			<inp2:m_if check="m_ParamEquals" name="section_name" value="in-portal:root">
+	 				<b><inp2:m_param name="label"/></b>
+	 			<inp2:m_else/>
+	 				<b><inp2:m_phrase name="$label"/></b>
+	 			</inp2:m_if>
+	 		</inp2:m_if>
+	 		
+	 		<inp2:m_if check="m_IsDebugMode">
+	 			<br />
+	 			<img src="img/spacer.gif" height="1" width="<inp2:g-perm_LevelIndicator level="$deep_level" multiply="20"/>" alt="" border="0"/>
+	 			<span class="small">[<inp2:m_param name="section_name"/>]</span>
+	 		</inp2:m_if>
 	 	</td>
-	 	<td colspan="2">
-	 		<table>
-	 			<inp2:adm_ListSectionPermissions render_as="permission_element" section_name="$section_name" type="0"/>
-	 		</table>
-	 	</td>
-	 	
+	 
+		<inp2:m_RenderElement name="permission_element" section_name="$section_name" perm_name="view"/>
+		<inp2:m_RenderElement name="permission_element" section_name="$section_name" perm_name="add"/>
+		<inp2:m_RenderElement name="permission_element" section_name="$section_name" perm_name="edit"/>
+		<inp2:m_RenderElement name="permission_element" section_name="$section_name" perm_name="delete"/>
+		<td>
+			<inp2:m_if check="g-perm_HasAdvancedPermissions" section_name="$section_name">
+				<a href="javascript:openSelector('g-perm', '<inp2:m_t t="groups/permissions_select" pass="all,g-perm" escape="1"/>', 'PermList');"><inp2:m_phrase name="la_btn_Change"/></a>
+			<inp2:m_else/>
+				&nbsp;
+			</inp2:m_if>
+		</td>
 	</tr>
 </inp2:m_DefineElement>
 
-<inp2:adm_BuildTree/>
+<inp2:adm_BuildTree />
+<inp2:g-perm_LoadPermissions/>
+
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="tableborder">
 	<inp2:m_set {$PrefixSpecial}_sequence="1" odd_even="table_color1"/>
-	<inp2:m_RenderElement name="subsection" title="la_section_Permissions"/>
 	
+	<tr class="subsectiontitle">
+		<td><inp2:m_phrase label="la_col_PermissionName"/></td>
+		<td><inp2:m_phrase label="la_col_PermView"/></td>
+		<td><inp2:m_phrase label="la_col_PermAdd"/></td>
+		<td><inp2:m_phrase label="la_col_PermEdit"/></td>
+		<td><inp2:m_phrase label="la_col_PermDelete"/></td>
+		<td><inp2:m_phrase label="la_col_AdditionalPermissions"/></td>
+	</tr>
+	
 	<inp2:adm_DrawTree render_as="tree_element" section_name="in-portal:root"/>
 </table>