[Phpgroupware-cvs] CVS: property/templates/default menu.xsl,1.6,1.7 project.xsl,1.4,1.5 standard_entity.xsl,1.6,1.7wo_hour.xsl,1.9,1.10

[Sigurd Nes <address@hidden>]

Update of /cvsroot/phpgroupware/property/templates/default
In directory subversions:/tmp/cvs-serv4529/templates/default

Modified Files:
        menu.xsl project.xsl standard_entity.xsl wo_hour.xsl 
Log Message:
no message

Index: menu.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/property/templates/default/menu.xsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** menu.xsl    1 Apr 2003 16:37:37 -0000       1.6
--- menu.xsl    7 Apr 2003 07:21:57 -0000       1.7
***************
*** 112,118 ****
                                        <a href="{$sublink_apartment}" 
onMouseover="window.status='{$sublang_apartment}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="sublang_apartment"/></a>
                                        
!                                       <xsl:variable 
name="sub_workorder_archive"><xsl:value-of 
select="sub_workorder_archive"/></xsl:variable>
                                        <a href="{$sub_workorder_archive}" 
onMouseover="window.status='{$sublang_workorder_archive}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="sublang_workorder_archive"/></a>
!                                       
                                        <xsl:variable 
name="sub_invoice_consume"><xsl:value-of 
select="sub_invoice_consume"/></xsl:variable>
                                        <a href="{$sub_invoice_consume}" 
onMouseover="window.status='{$sublang_invoice_consume}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="sublang_invoice_consume"/></a>
--- 112,118 ----
                                        <a href="{$sublink_apartment}" 
onMouseover="window.status='{$sublang_apartment}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="sublang_apartment"/></a>
                                        
!                               <!--    <xsl:variable 
name="sub_workorder_archive"><xsl:value-of 
select="sub_workorder_archive"/></xsl:variable>
                                        <a href="{$sub_workorder_archive}" 
onMouseover="window.status='{$sublang_workorder_archive}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="sublang_workorder_archive"/></a>
!                               -->     
                                        <xsl:variable 
name="sub_invoice_consume"><xsl:value-of 
select="sub_invoice_consume"/></xsl:variable>
                                        <a href="{$sub_invoice_consume}" 
onMouseover="window.status='{$sublang_invoice_consume}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="sublang_invoice_consume"/></a>

Index: project.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/property/templates/default/project.xsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** project.xsl 3 Apr 2003 19:12:45 -0000       1.4
--- project.xsl 7 Apr 2003 07:21:57 -0000       1.5
***************
*** 36,41 ****
                                <td colspan="4" width="100%">
                                        <xsl:call-template name="nextmatchs"/>
-                                       <!--    <xsl:with-param 
name="nextmatchs_params"/>
-                                       </xsl:call-template> -->
                                </td>
                        </tr>
--- 36,39 ----
***************
*** 160,164 ****
                                        <xsl:value-of select="start_date"/>
                                </td>
- 
                                <xsl:choose>
                                        <xsl:when test="//lookup='true'">
--- 158,161 ----

Index: standard_entity.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/property/templates/default/standard_entity.xsl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** standard_entity.xsl 15 Feb 2003 19:51:40 -0000      1.6
--- standard_entity.xsl 7 Apr 2003 07:21:57 -0000       1.7
***************
*** 23,26 ****
--- 23,27 ----
                <div align="left">
                <xsl:call-template name="app_header"/>
+               <xsl:call-template name="menu"/> 
                <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
                        <tr>

Index: wo_hour.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/property/templates/default/wo_hour.xsl,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** wo_hour.xsl 4 Apr 2003 10:34:43 -0000       1.9
--- wo_hour.xsl 7 Apr 2003 07:21:57 -0000       1.10
***************
*** 9,14 ****
                                <xsl:apply-templates select="list_template"/>
                        </xsl:when>
!                       <xsl:when test="template">
!                               <xsl:apply-templates select="template"/>
                        </xsl:when>
                        <xsl:when test="add_template">
--- 9,14 ----
                                <xsl:apply-templates select="list_template"/>
                        </xsl:when>
!                       <xsl:when test="list_template_hour">
!                               <xsl:apply-templates 
select="list_template_hour"/>
                        </xsl:when>
                        <xsl:when test="add_template">
***************
*** 820,824 ****
  
  
!       <xsl:template match="template">
                <xsl:variable name="check_source"><xsl:value-of 
select="check_source"/></xsl:variable>
                <SCRIPT LANGUAGE="JavaScript" SRC="{$check_source}"></SCRIPT>
--- 820,824 ----
  
  
!       <xsl:template match="list_template_hour">
                <xsl:variable name="check_source"><xsl:value-of 
select="check_source"/></xsl:variable>
                <SCRIPT LANGUAGE="JavaScript" SRC="{$check_source}"></SCRIPT>
***************
*** 841,848 ****
                        </xsl:for-each> 
                </table>
- 
                <xsl:apply-templates select="workorder_data"/>
- <!--          <xsl:choose>
-                       <xsl:when test="values_template_hour[template_id]!=''"> 
-->
                                <table width="100%" cellpadding="2" 
cellspacing="2" align="center">
                                        <tr>
--- 841,845 ----
***************
*** 892,898 ****
                                        </tr>
                                </form>
- <!--                  </xsl:when>
-               </xsl:choose>                    -->                    
- 
                <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
                <hr noshade="noshade" width="100%" align="center" size="1"/>
--- 889,892 ----
***************
*** 909,918 ****
                        <xsl:apply-templates select="values_hour"/>
                        <xsl:apply-templates select="table_sum"/>
-                       <xsl:apply-templates select="table_done"/>
                </table>
        </xsl:template>
  
- 
- 
        <xsl:template match="table_header_template_hour">
                <xsl:variable name="sort_billperae"><xsl:value-of 
select="sort_billperae"/></xsl:variable>
--- 903,910 ----
                        <xsl:apply-templates select="values_hour"/>
                        <xsl:apply-templates select="table_sum"/>
                </table>
+                       <xsl:apply-templates select="table_done"/>
        </xsl:template>
  
        <xsl:template match="table_header_template_hour">
                <xsl:variable name="sort_billperae"><xsl:value-of 
select="sort_billperae"/></xsl:variable>
***************
*** 970,978 ****
                                </xsl:attribute>
                                <td align="right">
!                                       <xsl:choose>
!                                               <xsl:when 
test="building_part>0">
!                                                       <xsl:value-of 
select="building_part"/>
!                                               </xsl:when>
!                                       </xsl:choose>
                                </td>
                                <td align="left">
--- 962,966 ----
                                </xsl:attribute>
                                <td align="right">
!                                       <xsl:value-of select="building_part"/>
                                </td>
                                <td align="left">
***************
*** 1096,1101 ****
                        <xsl:apply-templates select="values_hour"/>
                        <xsl:apply-templates select="table_sum"/>
-                       <xsl:apply-templates select="table_done"/>
                </table>
        </xsl:template>
  
--- 1084,1089 ----
                        <xsl:apply-templates select="values_hour"/>
                        <xsl:apply-templates select="table_sum"/>
                </table>
+               <xsl:apply-templates select="table_done"/>
        </xsl:template>