[Phpgroupware-cvs] CVS: admin/inc class.uiaccounts.inc.php,1.23,1.24

[Miles Lott <address@hidden>]

Update of /cvsroot/phpgroupware/admin/inc
In directory subversions:/tmp/cvs-serv4201/inc

Modified Files:
        class.uiaccounts.inc.php 
Log Message:
Apply Patch #86, and add cancel buttons to account and group forms (need 
cleanup)



Index: class.uiaccounts.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/admin/inc/class.uiaccounts.inc.php,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** class.uiaccounts.inc.php    12 Jan 2002 15:46:47 -0000      1.23
--- class.uiaccounts.inc.php    24 Jan 2002 12:28:45 -0000      1.24
***************
*** 90,94 ****
                                'sort_name'     => 
$this->nextmatchs->show_sort_order($sort,'account_lid',$order,'/index.php',lang('name'),'menuaction=admin.uiaccounts.list_groups'),
                                'header_edit'   => lang('Edit'),
!                               'header_delete' => lang('Delete')
                        );
                        $p->set_var($var);
--- 90,96 ----
                                'sort_name'     => 
$this->nextmatchs->show_sort_order($sort,'account_lid',$order,'/index.php',lang('name'),'menuaction=admin.uiaccounts.list_groups'),
                                'header_edit'   => lang('Edit'),
!                               'header_delete' => lang('Delete'),
!                               'lang_done'     => lang('Done'),
!                               'doneurl'       => 
$GLOBALS['phpgw']->link('/admin/index.php')
                        );
                        $p->set_var($var);
***************
*** 224,228 ****
                                'actionurl'    => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.add_user'),
                                'accounts_url' => $url,
!                               'lang_search'  => lang('search')
                        );
                        $p->set_var($var);
--- 226,232 ----
                                'actionurl'    => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.add_user'),
                                'accounts_url' => $url,
!                               'lang_search'  => lang('search'),
!                               'lang_done'    => lang('Done'),
!                               'doneurl'      => 
$GLOBALS['phpgw']->link('/admin/index.php')
                        );
                        $p->set_var($var);
***************
*** 751,754 ****
--- 755,759 ----
                        $var = Array(
                                'form_action'       => 
$GLOBALS['phpgw']->link('/index.php','menuaction=admin.boaccounts.'.($group_info['account_id']?'edit':'add').'_group'),
+                               'cancel_action'     => 
$GLOBALS['phpgw']->link('/admin/index.php'),
                                'hidden_vars'       => '<input type="hidden" 
name="account_id" value="' . $group_info['account_id'] . '">',
                                'lang_group_name'   => lang('group name'),
***************
*** 758,762 ****
                                'select_size'       => ($account_num < 
5?$account_num:5),
                                'user_list'         => $user_list,
!                               'lang_permissions'  => lang('Permissions this 
group has')
                        );
                        $p->set_var($var);
--- 763,768 ----
                                'select_size'       => ($account_num < 
5?$account_num:5),
                                'user_list'         => $user_list,
!                               'lang_permissions'  => lang('Permissions this 
group has'),
!                               'lang_cancel'       => lang('Cancel')
                        );
                        $p->set_var($var);
***************
*** 907,910 ****
--- 913,917 ----
                        $var = Array(
                                'form_action'    => 
$GLOBALS['phpgw']->link('/index.php',$page_params),
+                               'cancel_action'  => 
$GLOBALS['phpgw']->link('/admin/index.php'),
                                'error_messages' => 
(!$_errors?'':'<center>'.$GLOBALS['phpgw']->common->error_list($_errors).'</center>'),
                                'th_bg'          => 
$GLOBALS['phpgw_info']['theme']['th_bg'],
***************
*** 920,924 ****
                                'lang_expires'   => lang('Expires'),
                                'lang_firstname' => lang('First Name'),
!                               'lang_button'    => 
($_account_id?lang('Save'):lang('Add'))
                        /* 'lang_file_space' => lang('File Space') */
                        );
--- 927,932 ----
                                'lang_expires'   => lang('Expires'),
                                'lang_firstname' => lang('First Name'),
!                               'lang_button'    => 
($_account_id?lang('Save'):lang('Add')),
!                               'lang_cancel'    => lang('Cancel')
                        /* 'lang_file_space' => lang('File Space') */
                        );