Index: branches/RC/kernel/admin_templates/groups/groups_edit_permissions.tpl =================================================================== diff -u -r9363 -r11131 --- branches/RC/kernel/admin_templates/groups/groups_edit_permissions.tpl (.../groups_edit_permissions.tpl) (revision 9363) +++ branches/RC/kernel/admin_templates/groups/groups_edit_permissions.tpl (.../groups_edit_permissions.tpl) (revision 11131) @@ -1,15 +1,8 @@ - - - + + - - - - - - @@ -43,7 +36,6 @@ a_toolbar.HideButton('prev'); a_toolbar.HideButton('next'); a_toolbar.HideButton('sep1'); - //a_toolbar.HideButton('sep2'); a_toolbar.DisableButton('next'); @@ -64,7 +56,7 @@ @@ -40,7 +34,7 @@ . @@ -53,7 +47,7 @@ @@ -63,7 +57,7 @@
- [][]" name="[][]" value=""> + [][]" name="[][]" value=""> [][]" name="_cb_[][]" checked onchange="update_checkbox(this, document.getElementById('[][]'));" onclick="">   @@ -101,7 +93,7 @@ - ', 'PermList', null, 'OnGroupSavePermissions');"> + ', 'PermList', null, 'OnGroupSavePermissions');">   Index: branches/RC/core/admin_templates/groups/groups_edit_users.tpl =================================================================== diff -u -r8929 -r11131 --- branches/RC/core/admin_templates/groups/groups_edit_users.tpl (.../groups_edit_users.tpl) (revision 8929) +++ branches/RC/core/admin_templates/groups/groups_edit_users.tpl (.../groups_edit_users.tpl) (revision 11131) @@ -1,14 +1,6 @@ - - + + - - - - - - - - @@ -27,7 +19,7 @@ } ) ); a_toolbar.AddButton( new ToolBarButton('cancel', '', function() { - submit_event('g','OnCancelEdit'); + cancel_edit('g','OnCancelEdit','',''); } ) ); @@ -46,11 +38,11 @@ a_toolbar.AddButton( new ToolBarButton('usertogroup', '', function() { - alert('adding new user to group'); + openSelector('g-ug', '', 'GroupId', '800x600'); } ) ); - a_toolbar.AddButton( new ToolBarButton('delete', '', function() { - submit_event('g-ug','OnMassDelete'); + a_toolbar.AddButton( new ToolBarButton('delete', '', function() { + std_delete_items('g-ug'); } ) ); @@ -68,7 +60,6 @@ a_toolbar.HideButton('prev'); a_toolbar.HideButton('next'); a_toolbar.HideButton('sep1'); - //a_toolbar.HideButton('sep2'); a_toolbar.DisableButton('next'); @@ -84,7 +75,15 @@
- + + + + + + + + + - +
- [][]" name="[][]" value=""> + [][]" name="[][]" value=""> [][]" name="_cb_[][]" checked onchange="update_checkbox(this, document.getElementById('[][]'));">
- [][]" name="[][]" value=""> + [][]" name="[][]" value=""> [][]" name="_cb_[][]" checked onchange="update_checkbox(this, document.getElementById('[][]'));">
- + @@ -74,7 +68,7 @@ - +
\ No newline at end of file Index: branches/RC/core/admin_templates/groups/groups_edit.tpl =================================================================== diff -u -r10517 -r11131 --- branches/RC/core/admin_templates/groups/groups_edit.tpl (.../groups_edit.tpl) (revision 10517) +++ branches/RC/core/admin_templates/groups/groups_edit.tpl (.../groups_edit.tpl) (revision 11131) @@ -1,14 +1,8 @@ - - - - + + - - - - @@ -57,16 +51,18 @@
- - - - - - +
+
+ + + + + + + + + +
+ - - - - - Index: branches/RC/core/admin_templates/groups/permissions_selector.tpl =================================================================== diff -u -r8929 -r11131 --- branches/RC/core/admin_templates/groups/permissions_selector.tpl (.../permissions_selector.tpl) (revision 8929) +++ branches/RC/core/admin_templates/groups/permissions_selector.tpl (.../permissions_selector.tpl) (revision 11131) @@ -1,12 +1,6 @@ - - + + - - - - - - @@ -23,10 +17,10 @@ window.close(); } ) ); - + a_toolbar.Render(); - + @@ -40,7 +34,7 @@ . @@ -53,7 +47,7 @@ @@ -63,7 +57,7 @@
- [][]" name="[][]" value=""> + [][]" name="[][]" value=""> [][]" name="_cb_[][]" checked onchange="update_checkbox(this, document.getElementById('[][]'));">
- [][]" name="[][]" value=""> + [][]" name="[][]" value=""> [][]" name="_cb_[][]" checked onchange="update_checkbox(this, document.getElementById('[][]'));">
- + @@ -74,7 +68,7 @@ - +
\ No newline at end of file Index: branches/RC/kernel/admin_templates/groups/groups_edit.tpl =================================================================== diff -u -r10517 -r11131 --- branches/RC/kernel/admin_templates/groups/groups_edit.tpl (.../groups_edit.tpl) (revision 10517) +++ branches/RC/kernel/admin_templates/groups/groups_edit.tpl (.../groups_edit.tpl) (revision 11131) @@ -1,14 +1,8 @@ - - - - + + - - - - @@ -57,16 +51,18 @@
- - - - - - +
+
+ + + + + + + + + +
+ - - - - - Index: branches/RC/core/admin_templates/groups/groups_list.tpl =================================================================== diff -u -r9367 -r11131 --- branches/RC/core/admin_templates/groups/groups_list.tpl (.../groups_list.tpl) (revision 9367) +++ branches/RC/core/admin_templates/groups/groups_list.tpl (.../groups_list.tpl) (revision 11131) @@ -1,12 +1,6 @@ - - + + - - - - - - @@ -17,14 +11,14 @@ function edit() { set_hidden_field('remove_specials[g.total]', 1); - std_edit_item('g.total', 'in-portal/groups/groups_edit'); + std_edit_item('g.total', 'groups/groups_edit'); } var a_toolbar = new ToolBar(); a_toolbar.AddButton( new ToolBarButton('new_group', '', function() { set_hidden_field('remove_specials[g.total]', 1); - std_precreate_item('g.total', 'in-portal/groups/groups_edit') + std_precreate_item('g.total', 'groups/groups_edit') } ) ); a_toolbar.AddButton( new ToolBarButton('edit', '', edit) ); @@ -37,7 +31,6 @@ a_toolbar.AddButton( new ToolBarSeparator('sep1') ); a_toolbar.AddButton( new ToolBarButton('e-mail', '', function() { -// openEmailSend('', 'group', 'g.total'); openSelector('emailmessages', '', 'UserEmail', null, 'OnPrepareMassRecipients'); } ) ); @@ -51,11 +44,13 @@ + +
- + Index: branches/RC/kernel/admin_templates/users/users_list.tpl =================================================================== diff -u -r11029 -r11131 --- branches/RC/kernel/admin_templates/users/users_list.tpl (.../users_list.tpl) (revision 11029) +++ branches/RC/kernel/admin_templates/users/users_list.tpl (.../users_list.tpl) (revision 11131) @@ -31,7 +31,7 @@ 'in-portal:primary_user_group', '::', function() { - openSelector('u', '', 'PrimaryGroupId', '800x600', 'OnSaveSelected'); + openSelector('u', '', 'PrimaryGroupId', '800x600', 'OnSaveSelected'); } ) ); Index: branches/RC/core/admin_templates/groups/groups_edit_permissions.tpl =================================================================== diff -u -r9363 -r11131 --- branches/RC/core/admin_templates/groups/groups_edit_permissions.tpl (.../groups_edit_permissions.tpl) (revision 9363) +++ branches/RC/core/admin_templates/groups/groups_edit_permissions.tpl (.../groups_edit_permissions.tpl) (revision 11131) @@ -1,15 +1,8 @@ - - - + + - - - - - - @@ -43,7 +36,6 @@ a_toolbar.HideButton('prev'); a_toolbar.HideButton('next'); a_toolbar.HideButton('sep1'); - //a_toolbar.HideButton('sep2'); a_toolbar.DisableButton('next'); @@ -64,7 +56,7 @@
- [][]" name="[][]" value=""> + [][]" name="[][]" value=""> [][]" name="_cb_[][]" checked onchange="update_checkbox(this, document.getElementById('[][]'));" onclick="">   @@ -101,7 +93,7 @@ - ', 'PermList', null, 'OnGroupSavePermissions');"> + ', 'PermList', null, 'OnGroupSavePermissions');">   Index: branches/RC/kernel/admin_templates/users/users_edit_groups.tpl =================================================================== diff -u -r10028 -r11131 --- branches/RC/kernel/admin_templates/users/users_edit_groups.tpl (.../users_edit_groups.tpl) (revision 10028) +++ branches/RC/kernel/admin_templates/users/users_edit_groups.tpl (.../users_edit_groups.tpl) (revision 11131) @@ -40,7 +40,7 @@ a_toolbar.AddButton( new ToolBarButton('in-portal:usertogroup', '::', function() { - openSelector('u-ug', '', 'GroupId', '800x600'); + openSelector('u-ug', '', 'GroupId', '800x600'); } ) ); a_toolbar.AddButton( new ToolBarButton('edit', '', edit) ); Index: branches/RC/kernel/admin_templates/groups/groups_list.tpl =================================================================== diff -u -r9367 -r11131 --- branches/RC/kernel/admin_templates/groups/groups_list.tpl (.../groups_list.tpl) (revision 9367) +++ branches/RC/kernel/admin_templates/groups/groups_list.tpl (.../groups_list.tpl) (revision 11131) @@ -1,12 +1,6 @@ - - + + - - - - - - @@ -17,14 +11,14 @@ function edit() { set_hidden_field('remove_specials[g.total]', 1); - std_edit_item('g.total', 'in-portal/groups/groups_edit'); + std_edit_item('g.total', 'groups/groups_edit'); } var a_toolbar = new ToolBar(); a_toolbar.AddButton( new ToolBarButton('new_group', '', function() { set_hidden_field('remove_specials[g.total]', 1); - std_precreate_item('g.total', 'in-portal/groups/groups_edit') + std_precreate_item('g.total', 'groups/groups_edit') } ) ); a_toolbar.AddButton( new ToolBarButton('edit', '', edit) ); @@ -37,7 +31,6 @@ a_toolbar.AddButton( new ToolBarSeparator('sep1') ); a_toolbar.AddButton( new ToolBarButton('e-mail', '', function() { -// openEmailSend('', 'group', 'g.total'); openSelector('emailmessages', '', 'UserEmail', null, 'OnPrepareMassRecipients'); } ) ); @@ -51,11 +44,13 @@ + +
- +