phpgroupware-cvs
[Top][All Lists]
Advanced

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

[Phpgroupware-cvs] property/templates/default project.xsl, 1.21, 1.22 wo


From: Sigurd Nes <address@hidden>
Subject: [Phpgroupware-cvs] property/templates/default project.xsl, 1.21, 1.22 wo_hour.xsl, 1.20, 1.21 tts.xsl, 1.19, 1.20
Date: Tue, 18 Nov 2003 16:25:17 +0000

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

Modified Files:
        project.xsl wo_hour.xsl tts.xsl 
Log Message:
no message

Index: tts.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/property/templates/default/tts.xsl,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** tts.xsl     17 Nov 2003 22:44:45 -0000      1.19
--- tts.xsl     18 Nov 2003 16:25:14 -0000      1.20
***************
*** 62,65 ****
--- 62,66 ----
                <xsl:variable name="lang_opened_by_statustext"><xsl:value-of 
select="lang_opened_by_statustext"/></xsl:variable>
                <xsl:variable name="lang_assigned_to_statustext"><xsl:value-of 
select="lang_assigned_to_statustext"/></xsl:variable>
+               <xsl:variable name="lang_finnish_statustext"><xsl:value-of 
select="lang_finnish_statustext"/></xsl:variable>
                        <tr class="th">
                                <td class="th_text" width="1%" align="right">
***************
*** 97,100 ****
--- 98,105 ----
                                        </td>
                                </xsl:for-each>
+                               <td class="th_text" width="8%" align="center">
+                                       <xsl:variable 
name="sort_finnish_date"><xsl:value-of 
select="sort_finnish_date"/></xsl:variable>
+                                       <a href="{$sort_finnish_date}" 
onMouseover="window.status='{$lang_finnish_statustext}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="lang_finnish_date"/></a>
+                               </td>
                        </tr>
        </xsl:template>
***************
*** 152,155 ****
--- 157,163 ----
                                        </td>
                                </xsl:for-each>
+                               <td class="small_text" align="center">
+                                       <xsl:value-of select="finnish_date"/>
+                               </td>
                        </tr>
        </xsl:template>
***************
*** 176,181 ****
  
        <xsl:template match="add">
!               <div align="left">
!               
                <table cellpadding="2" cellspacing="2" width="80%" 
align="center">
                        <xsl:choose>
--- 184,191 ----
  
        <xsl:template match="add">
!               <xsl:variable name="dateformat_source"><xsl:value-of 
select="dateformat_source"/></xsl:variable>
!               <SCRIPT LANGUAGE="JavaScript" 
SRC="{$dateformat_source}"></SCRIPT>
! 
!               <div align="left">              
                <table cellpadding="2" cellspacing="2" width="80%" 
align="center">
                        <xsl:choose>
***************
*** 228,231 ****
--- 238,258 ----
                                </td>
                        </tr>
+                       <tr>
+                               <td>
+                                       <xsl:value-of 
select="lang_finnish_date"/>
+                               </td>
+                               <td>
+                                       <input type="text" 
name="values[finnish_date]" value="{value_finnish_date}" 
onFocus="{dateformat_validate}" onKeyUp="{onKeyUp}" onBlur="{onBlur}" size="12" 
maxlength="10"  onMouseout="window.status='';return true;" >
+                                               <xsl:attribute 
name="onMouseover">
+                                                       
<xsl:text>window.status='</xsl:text>
+                                                               <xsl:value-of 
select="statustext"/>
+                                                       <xsl:text>';return 
true;</xsl:text>
+                                               </xsl:attribute>
+                                       </input>
+                                       [<xsl:value-of 
select="lang_dateformat"/>]
+                               </td>
+                       </tr>
+ 
+ 
                <!--    <tr>
                                <td valign="top">
***************
*** 319,327 ****
                                Window1=window.open('<xsl:value-of 
select="request_link"/>');
                        }               
-                       function start_report()
-                       {
-                               Window1=window.open('<xsl:value-of 
select="report_link"/>');
-                       }               
                </script>
                <div align="left">
                
--- 346,352 ----
                                Window1=window.open('<xsl:value-of 
select="request_link"/>');
                        }               
                </script>
+               <xsl:variable name="dateformat_source"><xsl:value-of 
select="dateformat_source"/></xsl:variable>
+               <SCRIPT LANGUAGE="JavaScript" 
SRC="{$dateformat_source}"></SCRIPT>
                <div align="left">
                
***************
*** 512,515 ****
--- 537,555 ----
                                <td>
                                        <xsl:call-template name="cat_select"/>
+                               </td>
+                       </tr>
+                       <tr>
+                               <td>
+                                       <xsl:value-of 
select="lang_finnish_date"/>
+                               </td>
+                               <td>
+                                       <input type="text" 
name="values[finnish_date]" value="{value_finnish_date}" 
onFocus="{dateformat_validate}" onKeyUp="{onKeyUp}" onBlur="{onBlur}" size="12" 
maxlength="10"  onMouseout="window.status='';return true;" >
+                                               <xsl:attribute 
name="onMouseover">
+                                                       
<xsl:text>window.status='</xsl:text>
+                                                               <xsl:value-of 
select="statustext"/>
+                                                       <xsl:text>';return 
true;</xsl:text>
+                                               </xsl:attribute>
+                                       </input>
+                                       [<xsl:value-of 
select="lang_dateformat"/>]
                                </td>
                        </tr>

Index: project.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/property/templates/default/project.xsl,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** project.xsl 17 Nov 2003 22:46:38 -0000      1.21
--- project.xsl 18 Nov 2003 16:25:14 -0000      1.22
***************
*** 314,317 ****
--- 314,328 ----
                                </td>
                        </tr>
+                       <tr>
+                               <td valign="top">
+                                       <xsl:value-of 
select="lang_reserve_remainder"/>
+                               </td>
+                               <td>
+                                       <xsl:value-of 
select="value_reserve_remainder"/>
+                                       <xsl:text> </xsl:text> [ <xsl:value-of 
select="currency"/> ]
+                                       <xsl:text> </xsl:text> ( <xsl:value-of 
select="value_reserve_remainder_percent"/>
+                                       <xsl:text> % )</xsl:text>
+                               </td>
+                       </tr>
  
                        <tr>
***************
*** 819,822 ****
--- 830,853 ----
                                        <xsl:value-of select="value_budget"/>
                                        <xsl:text> </xsl:text> [ <xsl:value-of 
select="currency"/> ]
+                               </td>
+                       </tr>
+                       <tr>
+                               <td valign="top">
+                                       <xsl:value-of select="lang_reserve"/>
+                               </td>
+                               <td>
+                                       <xsl:value-of select="value_reserve"/>
+                                       <xsl:text> </xsl:text> [ <xsl:value-of 
select="currency"/> ]
+                               </td>
+                       </tr>
+                       <tr>
+                               <td valign="top">
+                                       <xsl:value-of 
select="lang_reserve_remainder"/>
+                               </td>
+                               <td>
+                                       <xsl:value-of 
select="value_reserve_remainder"/>
+                                       <xsl:text> </xsl:text> [ <xsl:value-of 
select="currency"/> ]
+                                       <xsl:text> </xsl:text> ( <xsl:value-of 
select="value_reserve_remainder_percent"/>
+                                       <xsl:text> % )</xsl:text>
                                </td>
                        </tr>

Index: wo_hour.xsl
===================================================================
RCS file: /cvsroot/phpgroupware/property/templates/default/wo_hour.xsl,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** wo_hour.xsl 17 Nov 2003 22:45:20 -0000      1.20
--- wo_hour.xsl 18 Nov 2003 16:25:14 -0000      1.21
***************
*** 91,94 ****
--- 91,97 ----
                                        <xsl:value-of select="lang_descr"/>
                                </td>
+                               <td class="th_text" width="80%">
+                                       <xsl:value-of select="lang_date"/>
+                               </td>
                                <td class="th_text" width="5%" align="left">
                                        <xsl:value-of select="lang_edit"/>
***************
*** 128,131 ****
--- 131,137 ----
                                        <xsl:value-of select="descr"/>
                                </td>
+                               <td class="small_text" align="left">
+                                       <xsl:value-of select="entry_date"/>
+                               </td>
                                <td class="small_text" align="center">
                                        <a href="{$link_edit}" 
onMouseover="window.status='{$lang_edit_statustext}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="text_edit"/></a>
***************
*** 1150,1153 ****
--- 1156,1165 ----
                                        <xsl:value-of 
select="value_sum_calculation"/>
                                </td>
+                               <td class="th_text" align="right">
+                                       <xsl:value-of select="sum_deviation"/>
+                               </td>
+                               <td class="th_text" align="right">
+                                       <xsl:value-of select="sum_result"/>
+                               </td>
                        </tr>
                        <tr>
***************
*** 1165,1168 ****
--- 1177,1184 ----
                                <td>
                                </td>
+                               <td>
+                               </td>
+                               <td>
+                               </td>
                                <td class="th_text" align="right">
                                        <xsl:value-of 
select="value_addition_rs"/>
***************
*** 1183,1186 ****
--- 1199,1206 ----
                                <td>
                                </td>
+                               <td>
+                               </td>
+                               <td>
+                               </td>
                                <td class="th_text" align="right">
                                        <xsl:value-of 
select="value_addition_percentage"/>
***************
*** 1201,1204 ****
--- 1221,1228 ----
                                <td>
                                </td>
+                               <td>
+                               </td>
+                               <td>
+                               </td>
                                <td class="th_text" align="right">
                                        <xsl:value-of select="value_sum_tax"/>
***************
*** 1219,1222 ****
--- 1243,1250 ----
                                <td>
                                </td>
+                               <td>
+                               </td>
+                               <td>
+                               </td>
                                <td class="th_text" align="right">
                                        <xsl:value-of select="value_total_sum"/>
***************
*** 1953,1960 ****
                                                        <xsl:value-of 
select="lang_id"/>
                                                </td>
!                                                               <td>
!                                                                       
<xsl:value-of select="value_id"/>
!                                                                       <input 
type="hidden" name="values[id]" value="{value_id}"></input>
!                                                               </td>
                                        </tr>
                                </xsl:when>
--- 1981,1996 ----
                                                        <xsl:value-of 
select="lang_id"/>
                                                </td>
!                                               <td>
!                                                       <xsl:value-of 
select="value_id"/>
!                                                       <input type="hidden" 
name="values[id]" value="{value_id}"></input>
!                                               </td>
!                                       </tr>
!                                       <tr>
!                                               <td valign="top">
!                                                       <xsl:value-of 
select="lang_date"/>
!                                               </td>
!                                               <td>
!                                                       <xsl:value-of 
select="entry_date"/>
!                                               </td>
                                        </tr>
                                </xsl:when>





reply via email to

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