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.8, 1.1.2.9 d


From: Joseph Engo <address@hidden>
Subject: [Phpgroupware-cvs] api/skins/default account_mgr.xsl, 1.1.2.8, 1.1.2.9 default.css, 1.1.1.1.2.8, 1.1.1.1.2.9 phpgw.xsl, 1.1.1.1.2.19, 1.1.1.1.2.20
Date: Mon, 03 Nov 2003 10:52:40 +0000

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

Modified Files:
      Tag: proposal-branch
        account_mgr.xsl default.css phpgw.xsl 
Log Message:
- Working on the form_state_values (Not complete)
- op history is currently broken (Will fix soon)


Index: default.css
===================================================================
RCS file: /cvsroot/phpgroupware/api/skins/default/default.css,v
retrieving revision 1.1.1.1.2.8
retrieving revision 1.1.1.1.2.9
diff -C2 -d -r1.1.1.1.2.8 -r1.1.1.1.2.9
*** default.css 29 Oct 2003 06:32:01 -0000      1.1.1.1.2.8
--- default.css 3 Nov 2003 10:52:38 -0000       1.1.1.1.2.9
***************
*** 61,64 ****
--- 61,70 ----
  }
  
+ .fake_link
+ {
+       color: #006699;
+       text-decoration: none
+ }
+ 
  .sideboxcontent
  {

Index: phpgw.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/api/skins/default/phpgw.xsl,v
retrieving revision 1.1.1.1.2.19
retrieving revision 1.1.1.1.2.20
diff -C2 -d -r1.1.1.1.2.19 -r1.1.1.1.2.20
*** phpgw.xsl   30 Oct 2003 21:18:15 -0000      1.1.1.1.2.19
--- phpgw.xsl   3 Nov 2003 10:52:38 -0000       1.1.1.1.2.20
***************
*** 32,36 ****
                                                                <xsl:if 
test="count(/PHPGW/API/apps/apps_item) = 0"><td align="center" width="10%" 
height="60">&#160;</td></xsl:if>
                                                                        
<xsl:for-each select="/PHPGW/API/apps/apps_item[name != 'api']">
!                                                                               
<td align="center" width="10%"><a 
href="{$baseurl}&amp;op={name}.base.start"><img height="60" 
border="0"><xsl:attribute name="src"><xsl:value-of select="name" 
/>/skins/<xsl:value-of select="/PHPGW/API/prefs/api.skin" 
/>/images/icon.png</xsl:attribute></img></a></td>
                                                                        
</xsl:for-each>
                                                                <td 
width="1%">&#160;</td>
--- 32,41 ----
                                                                <xsl:if 
test="count(/PHPGW/API/apps/apps_item) = 0"><td align="center" width="10%" 
height="60">&#160;</td></xsl:if>
                                                                        
<xsl:for-each select="/PHPGW/API/apps/apps_item[name != 'api']">
!                                                                               
<xsl:choose>
!                                                                               
        <xsl:when test="/PHPGW/API/form_lock = 1">
!                                                                               
                <td align="center" width="10%"><img height="60" 
border="0"><xsl:attribute name="src"><xsl:value-of select="name" 
/>/skins/<xsl:value-of select="/PHPGW/API/prefs/api.skin" 
/>/images/icon.png</xsl:attribute></img></td>                                   
                                                     </xsl:when>
!                                                                               
        <xsl:otherwise>
! <td align="center" width="10%"><a 
href="{$baseurl}&amp;op={name}.base.start"><img height="60" 
border="0"><xsl:attribute name="src"><xsl:value-of select="name" 
/>/skins/<xsl:value-of select="/PHPGW/API/prefs/api.skin" 
/>/images/icon.png</xsl:attribute></img></a></td>                               
                                                     </xsl:otherwise>
!                                                                               
</xsl:choose>
                                                                        
</xsl:for-each>
                                                                <td 
width="1%">&#160;</td>
***************
*** 40,44 ****
                                                                <xsl:if 
test="count(/PHPGW/API/apps/apps_item) = 0"><td align="center" 
class="mainnote">&#160;</td></xsl:if>
                                                                        
<xsl:for-each select="/PHPGW/API/apps/apps_item[name != 'api']">
!                                                                               
<td align="center" class="mainnote"><a 
href="{$baseurl}&amp;op={name}.base.start"><xsl:value-of select="title" 
/></a></td>
                                                                        
</xsl:for-each>
                                                                <td width="1%" 
colspan="100">&#160;</td>
--- 45,56 ----
                                                                <xsl:if 
test="count(/PHPGW/API/apps/apps_item) = 0"><td align="center" 
class="mainnote">&#160;</td></xsl:if>
                                                                        
<xsl:for-each select="/PHPGW/API/apps/apps_item[name != 'api']">
!                                                                               
<xsl:choose>
!                                                                               
        <xsl:when test="/PHPGW/API/form_lock = 1">
!                                                                               
                <td align="center" class="mainnote"><xsl:value-of 
select="title" /></td>
!                                                                               
        </xsl:when>
!                                                                               
        <xsl:otherwise>
!                                                                               
                <td align="center" class="mainnote"><a 
href="{$baseurl}&amp;op={name}.base.start"><xsl:value-of select="title" 
/></a></td>
!                                                                               
        </xsl:otherwise>
!                                                                               
</xsl:choose>
                                                                        
</xsl:for-each>
                                                                <td width="1%" 
colspan="100">&#160;</td>
***************
*** 54,59 ****
                                                        <xsl:variable name="op" 
select="op" />
                                                        <xsl:variable 
name="title" select="title" />
  
!                                                       <b><a 
href="{$baseurl}&amp;op={$op}"><xsl:value-of select="$title" /></a></b>
                                                        <xsl:if 
test="position() != count(/PHPGW/API/op_history/op_history_item)">
                                                                &#160;/&#160;
--- 66,79 ----
                                                        <xsl:variable name="op" 
select="op" />
                                                        <xsl:variable 
name="title" select="title" />
+                                                       <xsl:variable 
name="position" select="position() - 1" />
  
!                                                       <xsl:choose>
!                                                               <xsl:when 
test="/PHPGW/API/form_lock = 1">
!                                                                       
<b><xsl:value-of select="$title" /></b>
!                                                               </xsl:when>
!                                                               <xsl:otherwise>
!                                                                       <b><a 
href="{$baseurl}&amp;op=api.base.op_history_redirect&amp;position_id={$position}"><xsl:value-of
 select="$title" /></a></b>
!                                                               </xsl:otherwise>
!                                                       </xsl:choose>
                                                        <xsl:if 
test="position() != count(/PHPGW/API/op_history/op_history_item)">
                                                                &#160;/&#160;
***************
*** 84,88 ****
                                                                                
        <tr>
                                                                                
                <td vAlign="top" align="center"><font 
color="#ff9933">*</font></td>
!                                                                               
                <td width="100%" height="20" align="left" vAlign="top"><a 
href="{$baseurl}&amp;op={$op}"><xsl:value-of select="title" /></a></td>
                                                                                
        </tr>
                                                                                
</xsl:for-each>
--- 104,115 ----
                                                                                
        <tr>
                                                                                
                <td vAlign="top" align="center"><font 
color="#ff9933">*</font></td>
!                                                                               
                <xsl:choose>
!                                                                               
                        <xsl:when test="/PHPGW/API/form_lock = 1">
!                                                                               
                                <td width="100%" height="20" align="left" 
vAlign="top"><font class="fake_link"><xsl:value-of select="title" /></font></td>
!                                                                               
                        </xsl:when>
!                                                                               
                        <xsl:otherwise>
!                                                                               
                                <td width="100%" height="20" align="left" 
vAlign="top"><a href="{$baseurl}&amp;op={$op}"><xsl:value-of select="title" 
/></a></td>
!                                                                               
                        </xsl:otherwise>
!                                                                               
                </xsl:choose>
                                                                                
        </tr>
                                                                                
</xsl:for-each>
***************
*** 105,109 ****
                                                                                
                <tr>
                                                                                
                        <td vAlign="top" align="center"><font 
color="#ff9933">*</font></td>
!                                                                               
                        <td width="100%" height="20" align="left" 
vAlign="top"><a href="{$baseurl}&amp;op={$op}"><xsl:value-of select="title" 
/></a></td>
                                                                                
                </tr>
                                                                                
        </xsl:for-each>
--- 132,143 ----
                                                                                
                <tr>
                                                                                
                        <td vAlign="top" align="center"><font 
color="#ff9933">*</font></td>
!                                                                               
                                <xsl:choose>
!                                                                               
                                        <xsl:when test="/PHPGW/API/form_lock = 
1">
!                                                                               
                                                <td width="100%" height="20" 
align="left" vAlign="top"><font class="fake_link"><xsl:value-of select="title" 
/></font></td>
!                                                                               
                                        </xsl:when>
!                                                                               
                                        <xsl:otherwise>
!                                                                               
                                                <td width="100%" height="20" 
align="left" vAlign="top"><a href="{$baseurl}&amp;op={$op}"><xsl:value-of 
select="title" /></a></td>
!                                                                               
                                        </xsl:otherwise>
!                                                                               
                                </xsl:choose>
                                                                                
                </tr>
                                                                                
        </xsl:for-each>

Index: account_mgr.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/api/skins/default/Attic/account_mgr.xsl,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -C2 -d -r1.1.2.8 -r1.1.2.9
*** account_mgr.xsl     29 Oct 2003 11:09:27 -0000      1.1.2.8
--- account_mgr.xsl     3 Nov 2003 10:52:38 -0000       1.1.2.9
***************
*** 124,129 ****
                                        </tr>
                                        <tr>
!                                               <td align="left"><input 
type="image" name="op" src="{$api_image_path}/cancel.png" 
value="api.admin.start" alt="Cancel" title="Cancel" /></td>
!                                               <td align="right"><input 
type="image" name="op" src="{$api_image_path}/save.png" 
value="api.account_mgr.create" alt="Create" title="Create" /></td>
                                                <td>&#160;</td>
                                        </tr>
--- 124,138 ----
                                        </tr>
                                        <tr>
!                                               <td colspan="3">
!                                                       <xsl:variable 
name="prevop" select="/PHPGW/API/prevop" />
! 
!                                                       <table width="100%" 
border="0">
!                                                               <td 
align="left" width="24"><input type="image" name="op" 
src="{$api_image_path}/clearform.png" value="api.base.form_clear" alt="Clear 
Form" title="Clear Form" /></td>
!                                                               <td 
align="left" width="24"><input type="image" name="op" 
src="{$api_image_path}/pause.png" value="api.base.form_pause" alt="Place form 
on hold" title="Place form on hold" /></td>
!                                                               <td 
width="*">&#160;</td>
!                                                               <td 
align="right" width="24"><input type="image" name="op" 
src="{$api_image_path}/cancel.png" value="api.admin.start" alt="Cancel" 
title="Cancel" /></td>
!                                                               <td 
align="right" width="24"><input type="image" name="op" 
src="{$api_image_path}/save.png" value="api.account_mgr.create" alt="Create" 
title="Create" /></td>
!                                                       </table>
!                                               </td>
                                                <td>&#160;</td>
                                        </tr>





reply via email to

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