extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-20 21:08:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Apply Patch #86, and add cancel buttons to account and group forms (need cleanup)

Browse Source
This commit is contained in:
Miles Lott 2002-01-24 12:28:45 +00:00
parent dc3a4f82ec
commit b715103cdb
6 changed files with 132 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
admin/inc/class.uiaccounts.inc.php
View File

@ -89,7 +89,9 @@
'lang_groups' => lang('user groups'), 'lang_groups' => lang('user groups'),
'sort_name' => $this->nextmatchs->show_sort_order($sort,'account_lid',$order,'/index.php',lang('name'),'menuaction=admin.uiaccounts.list_groups'), '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_edit' => lang('Edit'),
'header_delete' => lang('Delete') 'header_delete' => lang('Delete'),
'lang_done' => lang('Done'),
'doneurl' => $GLOBALS['phpgw']->link('/admin/index.php')
); );
$p->set_var($var); $p->set_var($var);
@ -223,7 +225,9 @@
'lang_view' => lang('view'), 'lang_view' => lang('view'),
'actionurl' => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.add_user'), 'actionurl' => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.add_user'),
'accounts_url' => $url, 'accounts_url' => $url,
'lang_search' => lang('search') 'lang_search' => lang('search'),
'lang_done' => lang('Done'),
'doneurl' => $GLOBALS['phpgw']->link('/admin/index.php')
); );
$p->set_var($var); $p->set_var($var);
@ -750,6 +754,7 @@
$var = Array( $var = Array(
'form_action' => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.boaccounts.'.($group_info['account_id']?'edit':'add').'_group'), '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'] . '">', 'hidden_vars' => '<input type="hidden" name="account_id" value="' . $group_info['account_id'] . '">',
'lang_group_name' => lang('group name'), 'lang_group_name' => lang('group name'),
'group_name_value' => $group_info['account_name'], 'group_name_value' => $group_info['account_name'],
@ -757,7 +762,8 @@
'error' => (!$_errors?'':'<center>'.$GLOBALS['phpgw']->common->error_list($_errors).'</center>'), 'error' => (!$_errors?'':'<center>'.$GLOBALS['phpgw']->common->error_list($_errors).'</center>'),
'select_size' => ($account_num < 5?$account_num:5), 'select_size' => ($account_num < 5?$account_num:5),
'user_list' => $user_list, 'user_list' => $user_list,
'lang_permissions' => lang('Permissions this group has') 'lang_permissions' => lang('Permissions this group has'),
'lang_cancel' => lang('Cancel')
); );
$p->set_var($var); $p->set_var($var);
@ -906,6 +912,7 @@
$var = Array( $var = Array(
'form_action' => $GLOBALS['phpgw']->link('/index.php',$page_params), '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>'), 'error_messages' => (!$_errors?'':'<center>'.$GLOBALS['phpgw']->common->error_list($_errors).'</center>'),
'th_bg' => $GLOBALS['phpgw_info']['theme']['th_bg'], 'th_bg' => $GLOBALS['phpgw_info']['theme']['th_bg'],
'tr_color1' => $GLOBALS['phpgw_info']['theme']['row_on'], 'tr_color1' => $GLOBALS['phpgw_info']['theme']['row_on'],
@ -919,7 +926,8 @@
'lang_groups' => lang('Groups'), 'lang_groups' => lang('Groups'),
'lang_expires' => lang('Expires'), 'lang_expires' => lang('Expires'),
'lang_firstname' => lang('First Name'), 'lang_firstname' => lang('First Name'),
'lang_button' => ($_account_id?lang('Save'):lang('Add')) 'lang_button' => ($_account_id?lang('Save'):lang('Add')),
'lang_cancel' => lang('Cancel')
/* 'lang_file_space' => lang('File Space') */ /* 'lang_file_space' => lang('File Space') */
); );
$t->set_var($var); $t->set_var($var);

99
admin/templates/default/account_form.tpl
View File

@ -2,55 +2,45 @@
{error_messages} {error_messages}
<form method="POST" action="{form_action}"> <form method="POST" action="{form_action}">
<div align="center"> <div align="center">
<table border="0" width="95%"> <table border="0" width="95%">
<tr> <tr>
<td valign="top"> <td valign="top">
{rows} {rows}
</td> </td>
<td valign="top"> <td valign="top">
<table border=0 width=100%>
<table border=0 width=100%> <tr bgcolor="{th_bg}">
<tr bgcolor="{th_bg}"> <td colspan="4"><b>{lang_action}</b></td>
<td colspan="4"><b>{lang_action}</b></td> </tr>
</tr> <tr bgcolor="{tr_color1}">
<td width="25%">{lang_loginid}</td>
<tr bgcolor="{tr_color1}"> <td width="25%">{account_lid}&nbsp;</td>
<td width="25%">{lang_loginid}</td> <td width="25%">{lang_account_active}:</td>
<td width="25%">{account_lid}&nbsp;</td> <td width="25%">{account_status}</td>
</tr>
<td width="25%">{lang_account_active}:</td> <tr bgcolor="{tr_color2}">
<td width="25%">{account_status}</td> <td>{lang_firstname}</td>
</tr> <td>{account_firstname}&nbsp;</td>
<td>{lang_lastname}</td>
<tr bgcolor="{tr_color2}"> <td>{account_lastname}&nbsp;</td>
<td>{lang_firstname}</td> </tr>
<td>{account_firstname}&nbsp;</td> {password_fields}
<td>{lang_lastname}</td> <tr bgcolor="{tr_color2}">
<td>{account_lastname}&nbsp;</td> <td>{lang_groups}</td>
</tr> <td colspan="3">{groups_select}&nbsp;</td>
</tr>
{password_fields} <tr bgcolor="{tr_color1}">
<td>{lang_expires}</td>
<tr bgcolor="{tr_color2}"> <td colspan="3">{input_expires}&nbsp;&nbsp;{lang_never}&nbsp;{never_expires}</td>
<td>{lang_groups}</td> </tr>
<td colspan="3">{groups_select}&nbsp;</td> {permissions_list}
</tr> {form_buttons}
</table>
<tr bgcolor="{tr_color1}"> </td>
<td>{lang_expires}</td> </tr>
<td colspan="3">{input_expires}&nbsp;&nbsp;{lang_never}&nbsp;{never_expires}</td> </table>
</tr> </div>
{permissions_list}
{form_buttons}
</table>
</td>
</tr>
</table>
</div>
</form> </form>
<!-- END form --> <!-- END form -->
@ -65,7 +55,10 @@
<!-- BEGIN form_buttons_ --> <!-- BEGIN form_buttons_ -->
<tr bgcolor="{tr_color2}"> <tr bgcolor="{tr_color2}">
<td colspan="4" align="right"><input type="submit" name="submit" value="{lang_button}"></td> <td colspan="2" align="left"><input type="submit" name="submit" value="{lang_button}"></td>
</form>
<form method="POST" action="{cancel_action}">
<td colspan="2" align="right"><input type="submit" name="cancel" value="{lang_cancel}"></td>
</tr> </tr>
<!-- END form_buttons_ --> <!-- END form_buttons_ -->
@ -80,7 +73,7 @@
<!-- END form_logininfo --> <!-- END form_logininfo -->
<!-- BEGIN link_row --> <!-- BEGIN link_row -->
<tr bgcolor="{tr_color}"> <tr bgcolor="{tr_color}">
<td>&nbsp;<a href="{row_link}">{row_text}</a></td> <td>&nbsp;<a href="{row_link}">{row_text}</a></td>
</tr> </tr>
<!-- END link_row --> <!-- END link_row -->

112
admin/templates/default/account_form_ldap.tpl
View File

@ -2,62 +2,51 @@
{error_messages} {error_messages}
<form method="POST" action="{form_action}"> <form method="POST" action="{form_action}">
<div align="center"> <div align="center">
<table border="0" width="95%"> <table border="0" width="95%">
<tr> <tr>
<td valign="top"> <td valign="top">
{rows} {rows}
</td> </td>
<td valign="top"> <td valign="top">
<table border=0 width=100%>
<table border=0 width=100%> <tr bgcolor="{th_bg}">
<tr bgcolor="{th_bg}"> <td colspan="4"><b>{lang_action}</b></td>
<td colspan="4"><b>{lang_action}</b></td> </tr>
</tr> <tr bgcolor="{tr_color1}">
<td width="25%">{lang_loginid}</td>
<tr bgcolor="{tr_color1}"> <td width="25%">{account_lid}&nbsp;</td>
<td width="25%">{lang_loginid}</td> <td width="25%">{lang_account_active}:</td>
<td width="25%">{account_lid}&nbsp;</td> <td width="25%">{account_status}</td>
</tr>
<td width="25%">{lang_account_active}:</td> <tr bgcolor="{tr_color2}">
<td width="25%">{account_status}</td> <td>{lang_firstname}</td>
</tr> <td>{account_firstname}&nbsp;</td>
<td>{lang_lastname}</td>
<tr bgcolor="{tr_color2}"> <td>{account_lastname}&nbsp;</td>
<td>{lang_firstname}</td> </tr>
<td>{account_firstname}&nbsp;</td> {password_fields}
<td>{lang_lastname}</td> <tr bgcolor="{tr_color2}">
<td>{account_lastname}&nbsp;</td> <td>{lang_homedir}</td>
</tr> <td>{homedirectory}&nbsp;</td>
<td>{lang_shell}</td>
{password_fields} <td>{loginshell}&nbsp;</td>
</tr>
<tr bgcolor="{tr_color2}"> <tr bgcolor="{tr_color2}">
<td>{lang_homedir}</td> <td>{lang_groups}</td>
<td>{homedirectory}&nbsp;</td> <td colspan="3">{groups_select}&nbsp;</td>
<td>{lang_shell}</td> </tr>
<td>{loginshell}&nbsp;</td> <tr bgcolor="{tr_color1}">
</tr> <td>{lang_expires}</td>
<td colspan="3">{input_expires}&nbsp;&nbsp;{lang_never}&nbsp;{never_expires}</td>
<tr bgcolor="{tr_color2}"> </tr>
<td>{lang_groups}</td> {permissions_list}
<td colspan="3">{groups_select}&nbsp;</td> {form_buttons}
</tr> </table>
</td>
<tr bgcolor="{tr_color1}"> </tr>
<td>{lang_expires}</td> </table>
<td colspan="3">{input_expires}&nbsp;&nbsp;{lang_never}&nbsp;{never_expires}</td> </div>
</tr>
{permissions_list}
{form_buttons}
</table>
</td>
</tr>
</table>
</div>
</form> </form>
<!-- END form --> <!-- END form -->
@ -72,7 +61,10 @@
<!-- BEGIN form_buttons_ --> <!-- BEGIN form_buttons_ -->
<tr bgcolor="{tr_color2}"> <tr bgcolor="{tr_color2}">
<td colspan="4" align="right"><input type="submit" name="submit" value="{lang_button}"></td> <td colspan="2" align="left"><input type="submit" name="submit" value="{lang_button}"></td>
</form>
<form method="POST" action="{cancel_action}">
<td colspan="2" align="right"><input type="submit" name="cancel" value="{lang_cancel}"></td>
</tr> </tr>
<!-- END form_buttons_ --> <!-- END form_buttons_ -->
@ -87,7 +79,7 @@
<!-- END form_logininfo --> <!-- END form_logininfo -->
<!-- BEGIN link_row --> <!-- BEGIN link_row -->
<tr bgcolor="{tr_color}"> <tr bgcolor="{tr_color}">
<td>&nbsp;<a href="{row_link}">{row_text}</a></td> <td>&nbsp;<a href="{row_link}">{row_text}</a></td>
</tr> </tr>
<!-- END link_row --> <!-- END link_row -->

7
admin/templates/default/accounts.tpl
View File

@ -34,11 +34,16 @@
{input_add} {input_add}
</form> </form>
</td> </td>
<td align="right"> <td align="center">
<form method="POST" action="{accounts_url}"> <form method="POST" action="{accounts_url}">
{input_search} {input_search}
</form> </form>
</td> </td>
<td align="right">
<form method="POST" action="{doneurl}">
<input type="submit" name="done" value="{lang_done}">
</form>
</td>
</tr> </tr>
</table> </table>
</div> </div>

13
admin/templates/default/group_form.tpl
View File

@ -30,15 +30,22 @@
<tr> <tr>
<td>{lang_permissions}</td> <td>{lang_permissions}</td>
<td><table width="100%" border="0" cols="6"> <td>
<table width="100%" border="0" cols="6">
{permissions_list} {permissions_list}
</table></td> </table>
</td>
</tr> </tr>
<tr> <tr>
<td colspan="2" align="center"> <td colspan="2" align="left">
<input type="submit" name="submit" value="{lang_submit_button}"> <input type="submit" name="submit" value="{lang_submit_button}">
</td> </td>
</form>
<form method="POST" action="{cancel_action}">
<td align="left">
<input type="submit" name="cancel" value="{lang_cancel}">
</td>
</tr> </tr>
</form> </form>
</table> </table>

7
admin/templates/default/groups.tpl
View File

@ -26,11 +26,16 @@
{input_add} {input_add}
</form> </form>
</td> </td>
<td align="right"> <td align="center">
<form method="POST" action="{search_action}"> <form method="POST" action="{search_action}">
{input_search} {input_search}
</form> </form>
</td> </td>
<td align="right">
<form method="POST" action="{doneurl}">
<input type="submit" name="done" value="{lang_done}">
</form>
</td>
</tr> </tr>
</table> </table>
<!-- END list --> <!-- END list -->