|
| From: | Joseph Engo <address@hidden> |
| Subject: | [Phpgroupware-cvs] api/skins/default account_mgr.xsl, 1.1.2.17, 1.1.2.18 acl_mgr.xsl, 1.1.2.4, 1.1.2.5 |
| Date: | Tue, 18 Nov 2003 16:19:51 +0000 |
Update of /cvsroot/phpgroupware/api/skins/default
In directory subversions:/tmp/cvs-serv28306/api/skins/default
Modified Files:
Tag: proposal-branch
account_mgr.xsl acl_mgr.xsl
Log Message:
- Changed the layout for view account a little.
- Replaced the "Maintain user" section with the basic ACL box. (The menu is now
in appmenu)
Index: acl_mgr.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/api/skins/default/Attic/acl_mgr.xsl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -C2 -d -r1.1.2.4 -r1.1.2.5
*** acl_mgr.xsl 17 Nov 2003 23:39:07 -0000 1.1.2.4
--- acl_mgr.xsl 18 Nov 2003 16:19:49 -0000 1.1.2.5
***************
*** 58,62 ****
</xsl:template>
! <xsl:template name="acl_mgr_account_basic">
<table class="normalbox" cellSpacing="1" cellPadding="0" width="100%"
border="0">
<tr>
--- 58,62 ----
</xsl:template>
! <xsl:template name="acl_mgr_account_basic_edit">
<table class="normalbox" cellSpacing="1" cellPadding="0" width="100%"
border="0">
<tr>
Index: account_mgr.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/api/skins/default/Attic/account_mgr.xsl,v
retrieving revision 1.1.2.17
retrieving revision 1.1.2.18
diff -C2 -d -r1.1.2.17 -r1.1.2.18
*** account_mgr.xsl 17 Nov 2003 23:39:07 -0000 1.1.2.17
--- account_mgr.xsl 18 Nov 2003 16:19:48 -0000 1.1.2.18
***************
*** 237,240 ****
--- 237,284 ----
</xsl:template>
+ <xsl:template name="acl_column">
+ <xsl:param name="item" />
+ <xsl:value-of select="$item/title" />
+ </xsl:template>
+
+ <xsl:template name="acl_mgr_account_basic_view">
+ <table class="normalbox" cellSpacing="1" cellPadding="0" width="100%"
border="0">
+ <tr>
+ <td class="sideboxtitle" align="center" height="28"
width="100%">Basic ACL options</td>
+ </tr>
+ <tr>
+ <td class="sideboxcontent" bgColor="#efefef">
+ <table class="sideboxtext" cellSpacing="0"
cellPadding="0" width="100%" border="0" valign="top">
+ <xsl:for-each
select="/PHPGW/APP/acl_options/acl_options_item">
+ <xsl:if
test="(position() mod 3) = 1">
+ <tr
class="sideboxtext">
+ <td
width="33%"><xsl:value-of select="title" /></td>
+ <xsl:if
test="following-sibling::acl_options_item[position() = 1]">
+
<td width="33%" valign="top">
+
<xsl:call-template name="acl_column">
+
<xsl:with-param name="item"
select="following-sibling::acl_options_item[position() = 1]" />
+
</xsl:call-template>
+
</td>
+
</xsl:if>
+ <xsl:if
test="following-sibling::acl_options_item[position() = 2]">
+
<td width="33%" valign="top">
+
<xsl:call-template name="acl_column">
+
<xsl:with-param name="item"
select="following-sibling::acl_options_item[position() = 2]" />
+
</xsl:call-template>
+
</td>
+
</xsl:if>
+ <td
width="*"> </td>
+ </tr>
+ </xsl:if>
+ </xsl:for-each>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td align="right"><input type="submit"
name="advanced_submit" value=">> Advanced" /></td>
+ </tr>
+ </table>
+ </xsl:template>
+
<!-- FIXME: Re-create this form -->
<xsl:template match="APP[action_type='view_account']">
***************
*** 243,269 ****
<table border="0" width="95%" cellpadding="1" cellspacing="1">
<tr>
! <td width="40%" valign="top">
<table class="normalbox" cellSpacing="1"
cellPadding="0" width="100%" border="0">
! <tr>
! <td class="sideboxtitle"
align="center" height="28">Maintain this user</td>
</tr>
<tr>
<td class="sideboxcontent"
bgColor="#efefef">
! <table
class="sideboxtext" cellSpacing="0" cellPadding="0" width="100%" border="0"
valign="top">
<tr>
! <td
vAlign="top" align="center"><font color="#ff9933">*</font></td>
! <td
width="100%" height="20" align="left" vAlign="top"><a
href="{$baseurl}&op=api.account_mgr.edit&account_id={id}">Edit this
user</a></td>
</tr>
<tr>
! <td
vAlign="top" align="center"><font color="#ff9933">*</font></td>
! <td
width="100%" height="20" align="left" vAlign="top"><a
href="{$baseurl}&op=api.account_mgr.delete&account_id={id}">Delete this
user</a></td>
</tr>
<tr>
! <td
vAlign="top" align="center"><font color="#ff9933">*</font></td>
! <td
width="100%" height="20" align="left" vAlign="top"><a
href="{$baseurl}&op=api.account_mgr.login_history&account_id={id}">View
login history</a></td>
</tr>
<tr>
! <td
vAlign="top" align="center"><font color="#ff9933">*</font></td>
! <td
width="100%" height="20" align="left" vAlign="top"><a
href="{$baseurl}&op=api.acl_mgr.view&account_id={id}">View extended
ACL</a></td>
</tr>
</table>
--- 287,329 ----
<table border="0" width="95%" cellpadding="1" cellspacing="1">
<tr>
! <td width="*" valign="top">
!
<table class="normalbox" cellSpacing="1"
cellPadding="0" width="100%" border="0">
! <tr>
! <td class="sideboxtitle"
align="center" height="28" width="100%">Account details</td>
</tr>
<tr>
<td class="sideboxcontent"
bgColor="#efefef">
! <table
class="sideboxtext" cellSpacing="0" cellPadding="0" width="70%" border="0"
valign="top" align="center">
<tr>
!
<td>Login ID:</td>
! <td
align="right"><xsl:value-of select="lid" /></td>
</tr>
<tr>
!
<td>First Name:</td>
! <td
align="right"><xsl:value-of select="firstname" /></td>
</tr>
<tr>
!
<td>Last Name:</td>
! <td
align="right"><xsl:value-of select="lastname" /></td>
</tr>
<tr>
!
<td>Expires:</td>
! <td
align="right"><xsl:value-of select="expires" /></td>
! </tr>
! <tr>
!
<td>Status:</td>
! <td
align="right">
!
<xsl:choose>
!
<xsl:when test="status = 'A'">Active</xsl:when>
!
<xsl:otherwise><b>Disabled</b></xsl:otherwise>
!
</xsl:choose>
! </td>
! </tr>
! <tr>
! <td
colspan="2"> </td>
! </tr>
! <tr>
! <td
colspan="2" align="right"><input type="image" name="op"
src="{$api_image_path}/cancel.png" value="api.statecache.cancel" alt="Done"
title="Done" /></td>
</tr>
</table>
***************
*** 271,325 ****
</tr>
</table>
-
- </td>
- <td width="*">
- <table class="normalbox" cellSpacing="1" cellPadding="0" width="100%"
border="0">
- <tr>
- <td class="sideboxtitle" align="center" height="28"
width="100%">Account details</td>
- </tr>
- <tr>
- <td class="sideboxcontent" bgColor="#efefef">
- <table class="sideboxtext" cellSpacing="0"
cellPadding="0" width="70%" border="0" valign="top" align="center">
- <tr>
- <td>Login ID:</td>
- <td align="right"><xsl:value-of
select="lid" /></td>
- </tr>
- <tr>
- <td>First Name:</td>
- <td align="right"><xsl:value-of
select="firstname" /></td>
- </tr>
- <tr>
- <td>Last Name:</td>
- <td align="right"><xsl:value-of
select="lastname" /></td>
- </tr>
- <tr>
- <td>Expires:</td>
- <td align="right"><xsl:value-of
select="expires" /></td>
- </tr>
- <tr>
- <td>Status:</td>
- <td align="right">
- <xsl:choose>
- <xsl:when test="status
= 'A'">
- Active
- </xsl:when>
- <xsl:otherwise>
- <b>Disabled</b>
- </xsl:otherwise>
- </xsl:choose>
- </td>
- </tr>
- <tr>
- <td colspan="2"> </td>
- </tr>
- <tr>
- <td colspan="2"
align="right"><input type="image" name="op" src="{$api_image_path}/cancel.png"
value="api.statecache.cancel" alt="Done" title="Done" /></td>
- </tr>
- </table>
</td>
! </tr>
! </table>
!
</td>
</tr>
--- 331,338 ----
</tr>
</table>
</td>
! <td width="45%" valign="top">
! <xsl:call-template
name="acl_mgr_account_basic_view" />
</td>
</tr>
| [Prev in Thread] | Current Thread | [Next in Thread] |