mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-10-05 09:42:30 +02:00
Apply Patch #86, and add cancel buttons to account and group forms (need cleanup)
This commit is contained in:
Miles Lott
parent
dc3a4f82ec
commit
b715103cdb
@ -89,7 +89,9 @@
|
||||
'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'),
|
||||
'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);
|
||||
|
||||
@ -223,7 +225,9 @@
|
||||
'lang_view' => lang('view'),
|
||||
'actionurl' => $GLOBALS['phpgw']->link('/index.php','menuaction=admin.uiaccounts.add_user'),
|
||||
'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);
|
||||
|
||||
@ -750,6 +754,7 @@
|
||||
|
||||
$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'),
|
||||
'group_name_value' => $group_info['account_name'],
|
||||
@ -757,7 +762,8 @@
|
||||
'error' => (!$_errors?'':'<center>'.$GLOBALS['phpgw']->common->error_list($_errors).'</center>'),
|
||||
'select_size' => ($account_num < 5?$account_num:5),
|
||||
'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);
|
||||
|
||||
@ -906,6 +912,7 @@
|
||||
|
||||
$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'],
|
||||
'tr_color1' => $GLOBALS['phpgw_info']['theme']['row_on'],
|
||||
@ -919,7 +926,8 @@
|
||||
'lang_groups' => lang('Groups'),
|
||||
'lang_expires' => lang('Expires'),
|
||||
'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') */
|
||||
);
|
||||
$t->set_var($var);
|
||||
|
||||
@ -2,55 +2,45 @@
|
||||
{error_messages}
|
||||
|
||||
<form method="POST" action="{form_action}">
|
||||
<div align="center">
|
||||
<table border="0" width="95%">
|
||||
<tr>
|
||||
<td valign="top">
|
||||
{rows}
|
||||
</td>
|
||||
<td valign="top">
|
||||
|
||||
<table border=0 width=100%>
|
||||
<tr bgcolor="{th_bg}">
|
||||
<td colspan="4"><b>{lang_action}</b></td>
|
||||
</tr>
|
||||
|
||||
<tr bgcolor="{tr_color1}">
|
||||
<td width="25%">{lang_loginid}</td>
|
||||
<td width="25%">{account_lid} </td>
|
||||
|
||||
<td width="25%">{lang_account_active}:</td>
|
||||
<td width="25%">{account_status}</td>
|
||||
</tr>
|
||||
|
||||
<tr bgcolor="{tr_color2}">
|
||||
<td>{lang_firstname}</td>
|
||||
<td>{account_firstname} </td>
|
||||
<td>{lang_lastname}</td>
|
||||
<td>{account_lastname} </td>
|
||||
</tr>
|
||||
|
||||
{password_fields}
|
||||
|
||||
<tr bgcolor="{tr_color2}">
|
||||
<td>{lang_groups}</td>
|
||||
<td colspan="3">{groups_select} </td>
|
||||
</tr>
|
||||
|
||||
<tr bgcolor="{tr_color1}">
|
||||
<td>{lang_expires}</td>
|
||||
<td colspan="3">{input_expires} {lang_never} {never_expires}</td>
|
||||
</tr>
|
||||
|
||||
{permissions_list}
|
||||
|
||||
{form_buttons}
|
||||
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<div align="center">
|
||||
<table border="0" width="95%">
|
||||
<tr>
|
||||
<td valign="top">
|
||||
{rows}
|
||||
</td>
|
||||
<td valign="top">
|
||||
<table border=0 width=100%>
|
||||
<tr bgcolor="{th_bg}">
|
||||
<td colspan="4"><b>{lang_action}</b></td>
|
||||
</tr>
|
||||
<tr bgcolor="{tr_color1}">
|
||||
<td width="25%">{lang_loginid}</td>
|
||||
<td width="25%">{account_lid} </td>
|
||||
<td width="25%">{lang_account_active}:</td>
|
||||
<td width="25%">{account_status}</td>
|
||||
</tr>
|
||||
<tr bgcolor="{tr_color2}">
|
||||
<td>{lang_firstname}</td>
|
||||
<td>{account_firstname} </td>
|
||||
<td>{lang_lastname}</td>
|
||||
<td>{account_lastname} </td>
|
||||
</tr>
|
||||
{password_fields}
|
||||
<tr bgcolor="{tr_color2}">
|
||||
<td>{lang_groups}</td>
|
||||
<td colspan="3">{groups_select} </td>
|
||||
</tr>
|
||||
<tr bgcolor="{tr_color1}">
|
||||
<td>{lang_expires}</td>
|
||||
<td colspan="3">{input_expires} {lang_never} {never_expires}</td>
|
||||
</tr>
|
||||
{permissions_list}
|
||||
{form_buttons}
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</form>
|
||||
<!-- END form -->
|
||||
|
||||
@ -65,7 +55,10 @@
|
||||
|
||||
<!-- BEGIN form_buttons_ -->
|
||||
<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>
|
||||
<!-- END form_buttons_ -->
|
||||
|
||||
@ -80,7 +73,7 @@
|
||||
<!-- END form_logininfo -->
|
||||
|
||||
<!-- BEGIN link_row -->
|
||||
<tr bgcolor="{tr_color}">
|
||||
<td> <a href="{row_link}">{row_text}</a></td>
|
||||
</tr>
|
||||
<tr bgcolor="{tr_color}">
|
||||
<td> <a href="{row_link}">{row_text}</a></td>
|
||||
</tr>
|
||||
<!-- END link_row -->
|
||||
|
||||
@ -2,62 +2,51 @@
|
||||
{error_messages}
|
||||
|
||||
<form method="POST" action="{form_action}">
|
||||
<div align="center">
|
||||
<table border="0" width="95%">
|
||||
<tr>
|
||||
<td valign="top">
|
||||
{rows}
|
||||
</td>
|
||||
<td valign="top">
|
||||
|
||||
<table border=0 width=100%>
|
||||
<tr bgcolor="{th_bg}">
|
||||
<td colspan="4"><b>{lang_action}</b></td>
|
||||
</tr>
|
||||
|
||||
<tr bgcolor="{tr_color1}">
|
||||
<td width="25%">{lang_loginid}</td>
|
||||
<td width="25%">{account_lid} </td>
|
||||
|
||||
<td width="25%">{lang_account_active}:</td>
|
||||
<td width="25%">{account_status}</td>
|
||||
</tr>
|
||||
|
||||
<tr bgcolor="{tr_color2}">
|
||||
<td>{lang_firstname}</td>
|
||||
<td>{account_firstname} </td>
|
||||
<td>{lang_lastname}</td>
|
||||
<td>{account_lastname} </td>
|
||||
</tr>
|
||||
|
||||
{password_fields}
|
||||
|
||||
<tr bgcolor="{tr_color2}">
|
||||
<td>{lang_homedir}</td>
|
||||
<td>{homedirectory} </td>
|
||||
<td>{lang_shell}</td>
|
||||
<td>{loginshell} </td>
|
||||
</tr>
|
||||
|
||||
<tr bgcolor="{tr_color2}">
|
||||
<td>{lang_groups}</td>
|
||||
<td colspan="3">{groups_select} </td>
|
||||
</tr>
|
||||
|
||||
<tr bgcolor="{tr_color1}">
|
||||
<td>{lang_expires}</td>
|
||||
<td colspan="3">{input_expires} {lang_never} {never_expires}</td>
|
||||
</tr>
|
||||
|
||||
{permissions_list}
|
||||
|
||||
{form_buttons}
|
||||
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<div align="center">
|
||||
<table border="0" width="95%">
|
||||
<tr>
|
||||
<td valign="top">
|
||||
{rows}
|
||||
</td>
|
||||
<td valign="top">
|
||||
<table border=0 width=100%>
|
||||
<tr bgcolor="{th_bg}">
|
||||
<td colspan="4"><b>{lang_action}</b></td>
|
||||
</tr>
|
||||
<tr bgcolor="{tr_color1}">
|
||||
<td width="25%">{lang_loginid}</td>
|
||||
<td width="25%">{account_lid} </td>
|
||||
<td width="25%">{lang_account_active}:</td>
|
||||
<td width="25%">{account_status}</td>
|
||||
</tr>
|
||||
<tr bgcolor="{tr_color2}">
|
||||
<td>{lang_firstname}</td>
|
||||
<td>{account_firstname} </td>
|
||||
<td>{lang_lastname}</td>
|
||||
<td>{account_lastname} </td>
|
||||
</tr>
|
||||
{password_fields}
|
||||
<tr bgcolor="{tr_color2}">
|
||||
<td>{lang_homedir}</td>
|
||||
<td>{homedirectory} </td>
|
||||
<td>{lang_shell}</td>
|
||||
<td>{loginshell} </td>
|
||||
</tr>
|
||||
<tr bgcolor="{tr_color2}">
|
||||
<td>{lang_groups}</td>
|
||||
<td colspan="3">{groups_select} </td>
|
||||
</tr>
|
||||
<tr bgcolor="{tr_color1}">
|
||||
<td>{lang_expires}</td>
|
||||
<td colspan="3">{input_expires} {lang_never} {never_expires}</td>
|
||||
</tr>
|
||||
{permissions_list}
|
||||
{form_buttons}
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
</form>
|
||||
<!-- END form -->
|
||||
|
||||
@ -72,7 +61,10 @@
|
||||
|
||||
<!-- BEGIN form_buttons_ -->
|
||||
<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>
|
||||
<!-- END form_buttons_ -->
|
||||
|
||||
@ -87,7 +79,7 @@
|
||||
<!-- END form_logininfo -->
|
||||
|
||||
<!-- BEGIN link_row -->
|
||||
<tr bgcolor="{tr_color}">
|
||||
<td> <a href="{row_link}">{row_text}</a></td>
|
||||
</tr>
|
||||
<tr bgcolor="{tr_color}">
|
||||
<td> <a href="{row_link}">{row_text}</a></td>
|
||||
</tr>
|
||||
<!-- END link_row -->
|
||||
|
||||
@ -34,11 +34,16 @@
|
||||
{input_add}
|
||||
</form>
|
||||
</td>
|
||||
<td align="right">
|
||||
<td align="center">
|
||||
<form method="POST" action="{accounts_url}">
|
||||
{input_search}
|
||||
</form>
|
||||
</td>
|
||||
<td align="right">
|
||||
<form method="POST" action="{doneurl}">
|
||||
<input type="submit" name="done" value="{lang_done}">
|
||||
</form>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
@ -30,15 +30,22 @@
|
||||
|
||||
<tr>
|
||||
<td>{lang_permissions}</td>
|
||||
<td><table width="100%" border="0" cols="6">
|
||||
<td>
|
||||
<table width="100%" border="0" cols="6">
|
||||
{permissions_list}
|
||||
</table></td>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
|
||||
<tr>
|
||||
<td colspan="2" align="center">
|
||||
<td colspan="2" align="left">
|
||||
<input type="submit" name="submit" value="{lang_submit_button}">
|
||||
</td>
|
||||
</form>
|
||||
<form method="POST" action="{cancel_action}">
|
||||
<td align="left">
|
||||
<input type="submit" name="cancel" value="{lang_cancel}">
|
||||
</td>
|
||||
</tr>
|
||||
</form>
|
||||
</table>
|
||||
|
||||
@ -26,11 +26,16 @@
|
||||
{input_add}
|
||||
</form>
|
||||
</td>
|
||||
<td align="right">
|
||||
<td align="center">
|
||||
<form method="POST" action="{search_action}">
|
||||
{input_search}
|
||||
</form>
|
||||
</td>
|
||||
<td align="right">
|
||||
<form method="POST" action="{doneurl}">
|
||||
<input type="submit" name="done" value="{lang_done}">
|
||||
</form>
|
||||
</td>
|
||||
</tr>
|
||||
</table>
|
||||
<!-- END list -->
|
||||
|
||||
Loading…
Reference in New Issue
Block a user