Menu
▾
▴
[eGroupWare-cvs] admin/templates/default account_form.tpl,1.29.2.1,1.29.2.2 account_form_ldap.tpl,1.20.2.1,1.20.2.2 accounts.tpl,1.14,1.14.2.1 group_form.tpl,1.8.2.2,1.8.2.3 groups.tpl,1.9,1.9.2.1
Update of /cvsroot/egroupware/admin/templates/default
In directory sc8-pr-cvs1:/tmp/cvs-serv3552/default
Modified Files:
Tag: acl
account_form.tpl account_form_ldap.tpl accounts.tpl
group_form.tpl groups.tpl
Log Message:
Some templates are being updated to be compatible as functions merge
Index: account_form.tpl
===================================================================
RCS file: /cvsroot/egroupware/admin/templates/default/account_form.tpl,v
retrieving revision 1.29.2.1
retrieving revision 1.29.2.2
diff -C2 -d -r1.29.2.1 -r1.29.2.2
*** account_form.tpl 9 Nov 2003 14:25:34 -0000 1.29.2.1
--- account_form.tpl 30 Nov 2003 00:40:41 -0000 1.29.2.2
***************
*** 3,78 ****
<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_changepassword}</td>
! <td>{changepassword}</td>
! <td>{lang_anonymous}</td>
! <td>{anonymous}</td>
! </tr>
! <tr bgcolor="{tr_color1}">
! <td>{lang_role}</td>
! <td colspan="3">
! {lang_user} <input name="account_role" type="radio" value="u"{disabled_role_u}{role_checked_1}>
! {lang_group} <input name="account_role" type="radio" value="g"{disabled_role_g}{role_checked_32}>
! {lang_admin} <input name="account_role" type="radio" value="a"{disabled_role_a}{role_checked_64}>
! {lang_server} <input name="account_role" type="radio" value="s"{disabled_role_s}{role_checked_128}>
! {lang_domain} <input name="account_role" type="radio" value="d"{disabled_role_d}{role_checked_512}>
! </td>
! </tr>
! <tr bgcolor="{tr_color2}">
! <td>{lang_expires}</td>
! <td colspan="3">{input_expires} {lang_never} {never_expires}</td>
! </tr>
!
! <tr bgcolor="{tr_color1}">
! <td>{lang_groups}</td>
! <td>{groups_select} </td>
! <td>{lang_primary_group}</td>
! <td>{primary_group_select} </td>
! </tr>
! {permissions_list}
!
! {form_buttons}
!
! </table>
! </td>
! </tr>
! </table>
! </div>
</form>
<!-- END form -->
<!-- BEGIN form_passwordinfo -->
<tr bgcolor="{tr_color1}">
--- 3,98 ----
<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}
! {ldapfields}
! <tr bgcolor="{tr_color2}">
! <td>{lang_changepassword}</td>
! <td>{changepassword}</td>
! <td>{lang_anonymous}</td>
! <td>{anonymous}</td>
! </tr>
! <tr bgcolor="{tr_color1}">
! <td>{lang_role}</td>
! <td colspan="3">
! {lang_user} <input name="account_role" type="radio" value="1"{disabled_role_u}{role_checked_1}>
! {lang_group} <input name="account_role" type="radio" value="32"{disabled_role_g}{role_checked_32}>
! {lang_admin} <input name="account_role" type="radio" value="64"{disabled_role_a}{role_checked_64}>
! {lang_server} <input name="account_role" type="radio" value="128"{disabled_role_s}{role_checked_128}>
! {lang_domain} <input name="account_role" type="radio" value="512"{disabled_role_d}{role_checked_512}>
! </td>
! </tr>
!
! <tr bgcolor="{tr_color2}">
! <td>{lang_expires}</td>
! <td colspan="3">{input_expires} {lang_never} {never_expires}</td>
! </tr>
!
! <tr bgcolor="{tr_color1}">
! <td>{lang_groups}</td>
! <td>{groups_select} </td>
! <td>{lang_primary_group}</td>
! <td>{primary_group_select} </td>
! </tr>
!
! <tr bgcolor="{tr_color2}">
! <td>{lang_domain}</td>
! <td colspan="3">{domain_select} </td>
! </tr>
!
! <tr bgcolor="{tr_color2}">
! <td>{lang_server}</td>
! <td colspan="3">{server_select} </td>
! </tr>
!
! {permissions_list}
!
! {form_buttons}
!
! </table>
! </td>
! </tr>
! </table>
! </div>
</form>
<!-- END form -->
+ <!-- BEGIN ldap_fields -->
+ <tr bgcolor="{tr_color2}">
+ <td>{lang_homedir}</td>
+ <td>{homedirectory} </td>
+ <td>{lang_shell}</td>
+ <td>{loginshell} </td>
+ </tr>
+ <!-- END ldap_fields -->
+
<!-- BEGIN form_passwordinfo -->
<tr bgcolor="{tr_color1}">
***************
*** 86,90 ****
<!-- BEGIN form_buttons_ -->
<tr bgcolor="{tr_color2}">
! <td colspan="4" align="right"><input type="submit" name="submit" value="{lang_button}"></td>
</tr>
<!-- END form_buttons_ -->
--- 106,113 ----
<!-- BEGIN form_buttons_ -->
<tr bgcolor="{tr_color2}">
! <td colspan="4" align="right">
! <input type="submit" name="edit" value="{lang_submit_button}">
! <input type="submit" name="cancel" value="{lang_cancel_button}">
! </td>
</tr>
<!-- END form_buttons_ -->
***************
*** 101,106 ****
<!-- BEGIN link_row -->
! <tr bgcolor="{tr_color}">
! <td> <a href="{row_link}">{row_text}</a></td>
! </tr>
<!-- END link_row -->
--- 124,129 ----
<!-- BEGIN link_row -->
! <tr bgcolor="{tr_color}">
! <td> <a href="{row_link}">{row_text}</a></td>
! </tr>
<!-- END link_row -->
Index: account_form_ldap.tpl
===================================================================
RCS file: /cvsroot/egroupware/admin/templates/default/account_form_ldap.tpl,v
retrieving revision 1.20.2.1
retrieving revision 1.20.2.2
diff -C2 -d -r1.20.2.1 -r1.20.2.2
*** account_form_ldap.tpl 9 Nov 2003 14:25:34 -0000 1.20.2.1
--- account_form_ldap.tpl 30 Nov 2003 00:40:41 -0000 1.20.2.2
***************
*** 55,63 ****
<td>{lang_role}</td>
<td colspan="3">
! {lang_user} <input name="account_role" type="radio" value="u"{disabled_role_u}{role_checked_1}>
! {lang_group} <input name="account_role" type="radio" value="g"{disabled_role_g}{role_checked_32}>
! {lang_admin} <input name="account_role" type="radio" value="a"{disabled_role_a}{role_checked_64}>
! {lang_server} <input name="account_role" type="radio" value="s"{disabled_role_s}{role_checked_128}>
! {lang_domain} <input name="account_role" type="radio" value="d"{disabled_role_d}{role_checked_512}>
</td>
</tr>
--- 55,63 ----
<td>{lang_role}</td>
<td colspan="3">
! {lang_user} <input name="account_role" type="radio" value="1"{disabled_role_u}{role_checked_1}>
! {lang_group} <input name="account_role" type="radio" value="32"{disabled_role_g}{role_checked_32}>
! {lang_admin} <input name="account_role" type="radio" value="64"{disabled_role_a}{role_checked_64}>
! {lang_server} <input name="account_role" type="radio" value="128"{disabled_role_s}{role_checked_128}>
! {lang_domain} <input name="account_role" type="radio" value="512"{disabled_role_d}{role_checked_512}>
</td>
</tr>
Index: accounts.tpl
===================================================================
RCS file: /cvsroot/egroupware/admin/templates/default/accounts.tpl,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -C2 -d -r1.14 -r1.14.2.1
*** accounts.tpl 22 Oct 2003 05:14:56 -0000 1.14
--- accounts.tpl 30 Nov 2003 00:40:41 -0000 1.14.2.1
***************
*** 43,46 ****
--- 43,47 ----
<form method="POST" action="{accounts_url}">
{input_search}
+ <input type="hidden" name="account_type" value="{account_type}">
</form>
</td>
Index: group_form.tpl
===================================================================
RCS file: /cvsroot/egroupware/admin/templates/default/group_form.tpl,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -C2 -d -r1.8.2.2 -r1.8.2.3
*** group_form.tpl 9 Nov 2003 14:25:34 -0000 1.8.2.2
--- group_form.tpl 30 Nov 2003 00:40:41 -0000 1.8.2.3
***************
*** 1,8 ****
<script language="JavaScript">
! self.name="first_Window";
! function accounts_popup()
! {
! Window1=window.open('{accounts_link}',"Search","width=800,height=600,toolbar=no,scrollbars=yes,resizable=yes");
! }
</script>
--- 1,9 ----
+ <!-- BEGIN form -->
<script language="JavaScript">
! self.name="first_Window";
! function accounts_popup()
! {
! Window1=window.open('{accounts_link}',"Search","width=800,height=600,toolbar=no,scrollbars=yes,resizable=yes");
! }
</script>
***************
*** 55,58 ****
--- 56,60 ----
<td colspan="2" align="center">
<input type="submit" name="edit" value="{lang_submit_button}">
+ <input type="submit" name="cancel" value="{lang_cancel_button}">
</td>
</tr>
***************
*** 62,111 ****
</tr>
</table>
<!-- BEGIN select_user -->
-
<select name="account_user[]" multiple size="{aselect_size}">
{user_list}
</select>
-
<!-- END select_user -->
<!-- BEGIN select_group -->
-
<select name="account_group[]" multiple size="{gselect_size}">
{group_list}
</select>
-
<!-- END select_group -->
<!-- BEGIN popwin_user -->
!
! <table>
! <tr>
! <td>
! <select name="account_user[]" multiple size="{aselect_size}">{user_list}</select>
! </td>
! <td valign="top">
! <input type="button" value="{lang_open_popup}" onClick="accounts_popup()">
! <input type="hidden" name="accountid" value="{accountid}">
! </td>
! </tr>
! </table>
!
<!-- END popwin_user -->
<!-- BEGIN popwin_group -->
! <table>
! <tr>
! <td>
! <select name="account_group[]" multiple size="{gselect_size}">{user_list}</select>
! </td>
! <td valign="top">
! <input type="button" value="{lang_open_popup}" onClick="accounts_popup()">
! <input type="hidden" name="accountid" value="{accountid}">
! </td>
! </tr>
! </table>
- <!-- END popwin_group -->
--- 64,119 ----
</tr>
</table>
+ <!-- END form -->
<!-- BEGIN select_user -->
<select name="account_user[]" multiple size="{aselect_size}">
{user_list}
</select>
<!-- END select_user -->
<!-- BEGIN select_group -->
<select name="account_group[]" multiple size="{gselect_size}">
{group_list}
</select>
<!-- END select_group -->
<!-- BEGIN popwin_user -->
! <table>
! <tr>
! <td>
! <select name="account_user[]" multiple size="{aselect_size}">{user_list}</select>
! </td>
! <td valign="top">
! <input type="button" value="{lang_open_popup}" onClick="accounts_popup()">
! <input type="hidden" name="accountid" value="{accountid}">
! </td>
! </tr>
! </table>
<!-- END popwin_user -->
<!-- BEGIN popwin_group -->
+ <table>
+ <tr>
+ <td>
+ <select name="account_group[]" multiple size="{gselect_size}">{user_list}</select>
+ </td>
+ <td valign="top">
+ <input type="button" value="{lang_open_popup}" onClick="accounts_popup()">
+ <input type="hidden" name="accountid" value="{accountid}">
+ </td>
+ </tr>
+ </table>
+ <!-- END popwin_group -->
! <!-- BEGIN form_logininfo -->
!
! <!-- END form_logininfo -->
!
! <!-- BEGIN form_buttons_ -->
!
! <!-- END form_buttons_ -->
!
! <!-- BEGIN form_passwordinfo -->
!
! <!-- END form_passwordinfo -->
Index: groups.tpl
===================================================================
RCS file: /cvsroot/egroupware/admin/templates/default/groups.tpl,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -d -r1.9 -r1.9.2.1
*** groups.tpl 22 Oct 2003 05:14:56 -0000 1.9
--- groups.tpl 30 Nov 2003 00:40:41 -0000 1.9.2.1
***************
*** 11,17 ****
<table border="0" width="45%" align="center">
<tr bgcolor="{th_bg}">
! <td>{sort_name}</td>
! <td>{header_edit}</td>
! <td>{header_delete}</td>
</tr>
--- 11,18 ----
<table border="0" width="45%" align="center">
<tr bgcolor="{th_bg}">
! <td>{lang_group}</td>
! <td>{lang_edit}</td>
! <td>{lang_delete}</td>
! <td>{lang_view}</td>
</tr>
***************
*** 25,28 ****
--- 26,30 ----
<form method="POST" action="{new_action}">
{input_add}
+ <input type="hidden" name="account_type" value="{account_type}">
</form>
</td>
***************
*** 30,33 ****
--- 32,36 ----
<form method="POST" action="{search_action}">
{input_search}
+ <input type="hidden" name="account_type" value="{account_type}">
</form>
</td>
***************
*** 39,44 ****
<tr bgcolor="{tr_color}">
<td>{group_name}</td>
! <td width="5%">{edit_link}</td>
! <td width="5%">{delete_link}</td>
</tr>
<!-- END row -->
--- 42,48 ----
<tr bgcolor="{tr_color}">
<td>{group_name}</td>
! <td width="5%">{row_edit}</td>
! <td width="5%">{row_delete}</td>
! <td width="5%">{row_view}</td>
</tr>
<!-- END row -->
|