phpgroupware-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Phpgroupware-cvs] api/skins/default account_mgr.xsl, 1.1.2.20, 1.1.2.21


From: Joseph Engo <address@hidden>
Subject: [Phpgroupware-cvs] api/skins/default account_mgr.xsl, 1.1.2.20, 1.1.2.21 acl_mgr.xsl, 1.1.2.7, 1.1.2.8
Date: Mon, 01 Dec 2003 23:55:36 +0000

Update of /cvsroot/phpgroupware/api/skins/default
In directory subversions:/tmp/cvs-serv6374/api/skins/default

Modified Files:
      Tag: proposal-branch
        account_mgr.xsl acl_mgr.xsl 
Log Message:
This was a commit that I wanted to do last night, but SSH was screawed up for 
me locally, so I don't remeber all the changes.
- Some XSLT clean ups
- More work on the advaned and basic acl managers
- Default preferences are being set correctly now
- Some more crap I can't remeber


Index: acl_mgr.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/api/skins/default/Attic/acl_mgr.xsl,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -C2 -d -r1.1.2.7 -r1.1.2.8
*** acl_mgr.xsl 1 Dec 2003 07:36:36 -0000       1.1.2.7
--- acl_mgr.xsl 1 Dec 2003 23:55:34 -0000       1.1.2.8
***************
*** 21,25 ****
                                <xsl:otherwise>
                                        <xsl:attribute 
name="width">10%</xsl:attribute>
!                                       <input 
name="acl_allow[{$app}.{$locations_item/location}]" type="checkbox" />
                                </xsl:otherwise>
                        </xsl:choose>
--- 21,25 ----
                                <xsl:otherwise>
                                        <xsl:attribute 
name="width">10%</xsl:attribute>
!                                       <input 
name="acl_allow[{$app}.{$locations_item/location}]" type="checkbox" 
value="{$locations_item/value}" />
                                </xsl:otherwise>
                        </xsl:choose>
***************
*** 86,90 ****
                </tr>
                <tr>
!                       <td align="right"><input type="submit" 
name="advanced_submit" value=">> Advanced" /></td>
                </tr>
        </table>
--- 86,90 ----
                </tr>
                <tr>
!                       <td align="right"><input type="submit" 
name="acl_advanced_submit" value=">> Advanced" /></td>
                </tr>
        </table>
***************
*** 103,109 ****
                                        <table border="0" width="100%" 
cellspacing="0" cellpadding="0" class="normalbox_title">
                                                <tr>
!                                                       <td align="left" 
width="*"><input name="acl_checked[{$app}.base.start]" type="checkbox" 
/>&#160;<xsl:value-of select="title" /></td>
                                                        <xsl:if 
test="count(locations) > 0">
!                                                               <td 
align="right" width="10%"><input type="checkbox" /> All</td>
                                                        </xsl:if>
                                                </tr>
--- 103,109 ----
                                        <table border="0" width="100%" 
cellspacing="0" cellpadding="0" class="normalbox_title">
                                                <tr>
!                                                       <td align="left" 
width="*"><input name="acl_checked[{$app}.base.start]" type="checkbox" 
value="1" />&#160;<xsl:value-of select="title" /></td>
                                                        <xsl:if 
test="count(locations) > 0">
!                                                               <td 
align="right" width="10%">&#160;<!--<input type="checkbox" /> All--></td>
                                                        </xsl:if>
                                                </tr>

Index: account_mgr.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/api/skins/default/Attic/account_mgr.xsl,v
retrieving revision 1.1.2.20
retrieving revision 1.1.2.21
diff -C2 -d -r1.1.2.20 -r1.1.2.21
*** account_mgr.xsl     19 Nov 2003 20:44:28 -0000      1.1.2.20
--- account_mgr.xsl     1 Dec 2003 23:55:34 -0000       1.1.2.21
***************
*** 43,53 ****
                                                <td width="31%"><font 
color="#000000"><xsl:value-of select="account_firstname" /></font></td>
                                                <td width="*"><font 
color="#000000"><xsl:value-of select="account_lastname" /></font></td>
-                                               <td width="24" 
align="center"><a 
href="{$baseurl}&amp;op=api.account_mgr.edit&amp;account_id={$account_id}"><img 
alt="Edit" title="Edit" src="{$api_image_path}/edit.png" border="0" /></a></td>
                                                <xsl:choose>
!                                                       <xsl:when 
test="$account_id = /PHPGW/API/user/id or $account_lid = 'anonymous'">
!                                                               <td width="24" 
align="center"><img alt="Delete" title="Delete" 
src="{$api_image_path}/delete_x.png" border="0" /></td>
                                                        </xsl:when>
                                                        <xsl:otherwise>
!                                                               <td width="24" 
align="center"><a 
href="{$baseurl}&amp;op=api.account_mgr.delete&amp;account_id={$account_id}"><img
 alt="Delete" title="Delete" src="{$api_image_path}/delete.png" border="0" 
/></a></td>
                                                        </xsl:otherwise>
                                                </xsl:choose>
--- 43,70 ----
                                                <td width="31%"><font 
color="#000000"><xsl:value-of select="account_firstname" /></font></td>
                                                <td width="*"><font 
color="#000000"><xsl:value-of select="account_lastname" /></font></td>
                                                <xsl:choose>
!                                                       <xsl:when 
test="/PHPGW/APP/edit_allowed = 1">
!                                                               <td width="24" 
align="center"><a 
href="{$baseurl}&amp;op=api.account_mgr.edit&amp;account_id={$account_id}"><img 
alt="Edit" title="Edit" src="{$api_image_path}/edit.png" border="0" /></a></td>
                                                        </xsl:when>
                                                        <xsl:otherwise>
!                                                               <td 
width="24">&#160;</td>
!                                                       </xsl:otherwise>
!                                               </xsl:choose>
! 
!                                               <xsl:choose>
!                                                       <xsl:when 
test="/PHPGW/APP/delete_allowed = 1">
! 
!                                                               <xsl:choose>
!                                                                       
<xsl:when test="$account_id = /PHPGW/API/user/id or $account_lid = 'anonymous'">
!                                                                               
<td width="24" align="center"><img alt="Delete" title="Delete" 
src="{$api_image_path}/delete_x.png" border="0" /></td>
!                                                                       
</xsl:when>
!                                                                       
<xsl:otherwise>
!                                                                               
<td width="24" align="center"><a 
href="{$baseurl}&amp;op=api.account_mgr.delete&amp;account_id={$account_id}"><img
 alt="Delete" title="Delete" src="{$api_image_path}/delete.png" border="0" 
/></a></td>
!                                                                       
</xsl:otherwise>
!                                                               </xsl:choose>
! 
!                                                       </xsl:when>
!                                                       <xsl:otherwise>
!                                                               <td 
width="24">&#160;</td>
                                                        </xsl:otherwise>
                                                </xsl:choose>





reply via email to

[Prev in Thread] Current Thread [Next in Thread]