|
| From: | Bettina Gille <address@hidden> |
| Subject: | [Phpgroupware-cvs] CVS: admin/templates/default app_data.xsl,1.5,1.6 users.xsl,1.1,1.2 account_form.tpl,1.25,NONE |
| Date: | Sat, 26 Apr 2003 20:18:01 -0400 |
Update of /cvsroot/phpgroupware/admin/templates/default
In directory subversions:/tmp/cvs-serv25430/templates/default
Modified Files:
app_data.xsl users.xsl
Removed Files:
account_form.tpl
Log Message:
update xslt
Index: app_data.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/admin/templates/default/app_data.xsl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** app_data.xsl 23 Apr 2003 21:52:22 -0000 1.5
--- app_data.xsl 27 Apr 2003 00:17:58 -0000 1.6
***************
*** 21,24 ****
--- 21,27 ----
<xsl:call-template name="users"/>
</xsl:when>
+ <xsl:when test="account_edit">
+ <xsl:call-template name="users"/>
+ </xsl:when>
<xsl:when test="delete">
<xsl:call-template name="app_delete"/>
Index: users.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/admin/templates/default/users.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** users.xsl 23 Apr 2003 21:52:22 -0000 1.1
--- users.xsl 27 Apr 2003 00:17:58 -0000 1.2
***************
*** 6,11 ****
<xsl:apply-templates select="account_list"/>
</xsl:when>
! <xsl:when test="group_edit">
! <xsl:apply-templates select="user_edit"/>
</xsl:when>
</xsl:choose>
--- 6,11 ----
<xsl:apply-templates select="account_list"/>
</xsl:when>
! <xsl:when test="account_edit">
! <xsl:apply-templates select="account_edit"/>
</xsl:when>
</xsl:choose>
***************
*** 134,141 ****
<!-- END user_list -->
! <!-- BEGIN group_edit -->
! <xsl:template match="group_edit">
! <table border="0" cellpadding="2" cellspacing="2"
align="center" width="79%">
<tr>
<td><xsl:value-of select="error"/></td>
--- 134,141 ----
<!-- END user_list -->
! <!-- BEGIN account_edit -->
! <xsl:template match="account_edit">
! <table border="0" cellpadding="2" cellspacing="2"
align="center" width="95%">
<tr>
<td><xsl:value-of select="error"/></td>
***************
*** 149,186 ****
<xsl:variable
name="edit_url"><xsl:value-of select="edit_url"/></xsl:variable>
<xsl:variable name="account_id"
select="account_id"/>
! <xsl:variable
name="select_size" select="select_size"/>
<form action="{$edit_url}"
method="POST">
<input type="hidden"
name="values[account_id]" value="{$account_id}"/>
! <tr>
! <td><xsl:value-of
select="lang_account_name"/></td>
! <td><input
name="values[account_name]">
! <xsl:attribute
name="value">
!
<xsl:value-of select="value_account_name"/>
! </xsl:attribute>
! </input>
</td>
</tr>
! <tr>
! <td><xsl:value-of
select="lang_include_user"/></td>
! <td>
! <select
name="account_user[]" multiple="multiple" size="{$select_size}">
!
<xsl:apply-templates select="user_list"/>
</select>
</td>
</tr>
! <tr>
! <td><xsl:value-of
select="lang_file_space"/></td>
<td>
! <!-- {account_file_space}{account_file_space_select} -->
</td>
</tr>
<tr>
! <td
valign="top"><xsl:value-of select="lang_permissions"/></td>
! <td>
<table
width="100%" border="0" cellpadding="2" cellspacing="2">
<tr
class="th">
!
<td><xsl:value-of select="lang_application"/></td>
!
<td> </td>
!
<td><xsl:value-of select="lang_acl"/></td>
</tr>
<xsl:apply-templates select="app_list"/>
--- 149,225 ----
<xsl:variable
name="edit_url"><xsl:value-of select="edit_url"/></xsl:variable>
<xsl:variable name="account_id"
select="account_id"/>
! <xsl:variable
name="account_lid" select="account_lid"/>
! <xsl:variable
name="account_firstname" select="account_firstname"/>
! <xsl:variable
name="account_lastname" select="account_lastname"/>
! <xsl:variable
name="account_passwd" select="account_passwd"/>
! <xsl:variable
name="account_passwd_2" select="account_passwd_2"/>
<form action="{$edit_url}"
method="POST">
<input type="hidden"
name="values[account_id]" value="{$account_id}"/>
! <tr class="row_on">
! <td
width="25%"><xsl:value-of select="lang_lid"/></td>
! <td width="25%"><input
type="text" name="values[account_lid]" value="{$account_lid}"/></td>
! <td
width="25%"><xsl:value-of select="lang_account_active"/></td>
! <td width="25%">
! <xsl:choose>
!
<xsl:when test="account_status = 'yes'">
!
<input type="checkbox" name="values[account_status]" value="A"
checked="checked"/>
!
</xsl:when>
!
<xsl:otherwise>
!
<input type="checkbox" name="values[account_status]" value="A"/>
!
</xsl:otherwise>
! </xsl:choose>
</td>
</tr>
! <tr class="row_off">
! <td><xsl:value-of
select="lang_firstname"/></td>
! <td><input type="text"
name="values[account_firstname]" value="{$account_firstname}"/></td>
! <td><xsl:value-of
select="lang_lastname"/></td>
! <td><input type="text"
name="values[account_lastname]" value="{$account_lastname}"/></td>
! </tr>
!
! <!-- BEGIN form_passwordinfo -->
!
! <tr class="row_on">
! <td><xsl:value-of
select="lang_password"/></td>
! <td><input
type="password" name="values[account_passwd]" value="{$account_passwd}"/></td>
! <td><xsl:value-of
select="lang_reenter_password"/></td>
! <td><input
type="password" name="values[account_passwd_2]"
value="{$account_passwd_2}"/></td>
! </tr>
!
! <!-- END form_passwordinfo -->
!
! <tr class="row_off">
! <td><xsl:value-of
select="lang_groups"/></td>
! <td colspan="3">
! <select
name="account_groups[]" multiple="multiple">
!
<xsl:apply-templates select="group_list"/>
</select>
</td>
</tr>
!
! <tr class="row_on">
! <td><xsl:value-of
select="lang_expires"/></td>
! <td><xsl:value-of
disable-output-escaping="yes" select="select_expires"/></td>
! <td><xsl:value-of
select="lang_never"/></td>
<td>
! <xsl:choose>
!
<xsl:when test="never_expires = 'yes'">
!
<input type="checkbox" name="values[never_expires]" value="True"
checked="checked"/>
!
</xsl:when>
!
<xsl:otherwise>
!
<input type="checkbox" name="values[never_expires]" value="True"/>
!
</xsl:otherwise>
! </xsl:choose>
</td>
</tr>
<tr>
! <td colspan="4"
height="5"></td>
! </tr>
! <tr>
! <td colspan="4">
<table
width="100%" border="0" cellpadding="2" cellspacing="2">
<tr
class="th">
!
<td><xsl:value-of select="lang_applications"/></td>
!
<td></td>
</tr>
<xsl:apply-templates select="app_list"/>
***************
*** 188,193 ****
</td>
</tr>
<tr>
! <td colspan="2"
align="left">
<xsl:variable
name="lang_save"><xsl:value-of select="lang_save"/></xsl:variable>
<input
type="submit" name="values[save]" value="{$lang_save}"/>
--- 227,233 ----
</td>
</tr>
+
<tr>
! <td colspan="2">
<xsl:variable
name="lang_save"><xsl:value-of select="lang_save"/></xsl:variable>
<input
type="submit" name="values[save]" value="{$lang_save}"/>
***************
*** 197,204 ****
<tr>
<xsl:variable
name="done_url"><xsl:value-of select="done_url"/></xsl:variable>
! <xsl:variable
name="lang_done"><xsl:value-of select="lang_done"/></xsl:variable>
<form method="POST"
action="{$done_url}">
! <td align="left">
! <input
type="submit" name="done" value="{$lang_done}"/>
</td>
</form>
--- 237,244 ----
<tr>
<xsl:variable
name="done_url"><xsl:value-of select="done_url"/></xsl:variable>
! <xsl:variable
name="lang_cancel_done"><xsl:value-of select="lang_cancel_done"/></xsl:variable>
<form method="POST"
action="{$done_url}">
! <td>
! <input
type="submit" name="done" value="{$lang_cancel_done}"/>
</td>
</form>
***************
*** 210,214 ****
</xsl:template>
! <xsl:template match="user_list">
<xsl:variable name="account_id" select="account_id"/>
<xsl:choose>
--- 250,256 ----
</xsl:template>
! <!-- BEGIN group_list -->
!
! <xsl:template match="group_list">
<xsl:variable name="account_id" select="account_id"/>
<xsl:choose>
***************
*** 222,225 ****
--- 264,269 ----
</xsl:template>
+ <!-- BEGIN app_list -->
+
<xsl:template match="app_list">
<xsl:variable name="checkbox_name" select="checkbox_name"/>
***************
*** 238,242 ****
</xsl:choose>
</xsl:attribute>
! <td width="40%"><xsl:value-of select="app_name"/></td>
<td width="5%" align="center">
<xsl:choose>
--- 282,286 ----
</xsl:choose>
</xsl:attribute>
! <td width="40%"><xsl:value-of select="app_title"/></td>
<td width="5%" align="center">
<xsl:choose>
***************
*** 247,260 ****
<input type="checkbox"
name="{$checkbox_name}" value="True"/>
</xsl:otherwise>
- </xsl:choose>
- </td>
- <td width="5%" align="center">
- <xsl:choose>
- <xsl:when test="acl_url != ''">
- <xsl:variable name="acl_url"
select="acl_url"/>
- <xsl:variable name="acl_img"
select="acl_img"/>
- <xsl:variable name="img_name"
select="img_name"/>
- <a href="{$acl_url}"><img
src="{$acl_img}" border="0" hspace="3" align="absmiddle" alt="{$img_name}"
name="{$img_name}"/></a>
- </xsl:when>
</xsl:choose>
</td>
--- 291,294 ----
--- account_form.tpl DELETED ---
| [Prev in Thread] | Current Thread | [Next in Thread] |