phpgroupware-cvs
[Top][All Lists]
Advanced

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

[Phpgroupware-cvs] property/templates/default async.xsl, 1.2 attributes_


From: ceb
Subject: [Phpgroupware-cvs] property/templates/default async.xsl, 1.2 attributes_form.xsl, 1.4 attributes_view.xsl, 1.3 alarm.xsl, 1.2 agreement.xsl, 1.2 actor.xsl, 1.3 admin_entity.xsl, 1.3 b_account.xsl, 1.4 document.xsl, 1.3 values.xsl, 1.3 wo_hour.xsl, 1.3 workorder.xsl, 1.3 project.xsl, 1.6 location_view.xsl, 1.3 entity.xsl, 1.3 invoice.xsl, 1.8 abook_view.xsl, 1.3 abook_form.xsl, 1.3
Date: Thu, 24 Feb 2005 14:30:44 -0000

Update of property/templates/default

Modified Files:
     Branch: MAIN
            async.xsl lines: +17 -1
            attributes_form.xsl lines: +19 -1
            attributes_view.xsl lines: +18 -2
            alarm.xsl lines: +10 -8
            agreement.xsl lines: +3 -0
            actor.xsl lines: +28 -9
            admin_entity.xsl lines: +32 -1
            b_account.xsl lines: +16 -7
            document.xsl lines: +38 -1
            values.xsl lines: +2 -3
            wo_hour.xsl lines: +14 -1
            workorder.xsl lines: +29 -1
            project.xsl lines: +16 -2
            location_view.xsl lines: +33 -21
            entity.xsl lines: +21 -1
            invoice.xsl lines: +2 -2
            abook_view.xsl lines: +2 -2
            abook_form.xsl lines: +2 -2

Log Message:
committed prop-18-branch version to head

====================================================
Index: property/templates/default/async.xsl
diff -u property/templates/default/async.xsl:1.1 
property/templates/default/async.xsl:1.2
--- property/templates/default/async.xsl:1.1    Wed Jul 21 19:00:12 2004
+++ property/templates/default/async.xsl        Thu Jan 13 16:52:48 2005
@@ -51,6 +51,12 @@
                                <xsl:value-of select="lang_descr"/>
                        </td>
                        <td class="th_text" width="5%" align="center">
+                               <xsl:value-of select="lang_run"/>
+                       </td>
+                       <td class="th_text" width="5%" align="center">
+                               <xsl:value-of select="lang_schedule"/>
+                       </td>
+                       <td class="th_text" width="5%" align="center">
                                <xsl:value-of select="lang_edit"/>
                        </td>
                        <td class="th_text" width="5%" align="center">
@@ -60,6 +66,8 @@
        </xsl:template>

        <xsl:template match="values">
+               <xsl:variable name="lang_run_statustext"><xsl:value-of 
select="lang_run_statustext"/></xsl:variable>
+               <xsl:variable name="lang_schedule_statustext"><xsl:value-of 
select="lang_schedule_statustext"/></xsl:variable>
                <xsl:variable name="lang_view_statustext"><xsl:value-of 
select="lang_view_statustext"/></xsl:variable>
                <xsl:variable name="lang_edit_statustext"><xsl:value-of 
select="lang_edit_statustext"/></xsl:variable>
                <xsl:variable name="lang_delete_statustext"><xsl:value-of 
select="lang_delete_statustext"/></xsl:variable>
@@ -91,6 +99,14 @@
                                        <xsl:value-of select="first"/>
                                </td>
                                <td align="center">
+                                       <xsl:variable 
name="link_run"><xsl:value-of select="link_run"/></xsl:variable>
+                                       <a href="{$link_run}" 
onMouseover="window.status='{$lang_run_statustext}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of select="text_run"/></a>
+                               </td>
+                               <td align="center">
+                                       <xsl:variable 
name="link_schedule"><xsl:value-of select="link_schedule"/></xsl:variable>
+                                       <a href="{$link_schedule}" 
onMouseover="window.status='{$lang_schedule_statustext}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="text_schedule"/></a>
+                               </td>
+                               <td align="center">
                                        <xsl:variable 
name="link_edit"><xsl:value-of select="link_edit"/></xsl:variable>
                                        <a href="{$link_edit}" 
onMouseover="window.status='{$lang_edit_statustext}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="text_edit"/></a>
                                </td>

====================================================
Index: property/templates/default/attributes_form.xsl
diff -u property/templates/default/attributes_form.xsl:1.3 
property/templates/default/attributes_form.xsl:1.4
--- property/templates/default/attributes_form.xsl:1.3  Sat Oct 23 22:11:00 2004
+++ property/templates/default/attributes_form.xsl      Thu Jan 13 16:52:48 2005
@@ -75,6 +75,24 @@
                                                                                
</xsl:attribute>
                                                                        </input>
                                                                </xsl:when>
+                                                               <xsl:when 
test="datatype='VENDOR'">
+                                                                       
<xsl:variable name="vendor_name"><xsl:value-of 
select="name"/><xsl:text>_org_name</xsl:text></xsl:variable>
+                                                                       
<xsl:variable name="lookup_function"><xsl:text>lookup_</xsl:text><xsl:value-of 
select="name"/><xsl:text>();</xsl:text></xsl:variable>
+                                                                       <input 
type="text" name="{name}" value="{value}" onClick="{$lookup_function}" 
readonly="readonly" size="6" 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>
+                                                                       <input  
size="30" type="text" name="{$vendor_name}" value="{vendor_name}"  
onClick="{$lookup_function}" readonly="readonly">
+                                                                               
<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:when>
                                                                <xsl:when 
test="datatype='D'">
                                                                        <input 
type="text" name="values_attribute[{counter}][value]" value="{value}" 
onFocus="{//dateformat_validate}" onKeyUp="{//onKeyUp}" onBlur="{//onBlur}" 
size="12" maxlength="10"  onMouseout="window.status='';return true;" >
                                                                                
<xsl:attribute name="onMouseover">

====================================================
Index: property/templates/default/attributes_view.xsl
diff -u property/templates/default/attributes_view.xsl:1.2 
property/templates/default/attributes_view.xsl:1.3
--- property/templates/default/attributes_view.xsl:1.2  Wed Jun  2 19:09:40 2004
+++ property/templates/default/attributes_view.xsl      Thu Jan 13 16:52:48 2005
@@ -61,7 +61,23 @@
                                                                                
        <xsl:text>'; return true;</xsl:text>
                                                                                
</xsl:attribute>
                                                                        </input>
-                                                                       <input  
size="30" type="text" value="{org_name}"  readonly="readonly">
+                                                                       <input  
size="30" type="text" value="{contact_name}"  readonly="readonly">
+                                                                               
<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:when>
+                                                               <xsl:when 
test="datatype='VENDOR'">
+                                                                       <input 
type="text" value="{value}" readonly="readonly" size="6" 
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>
+                                                                       <input  
size="30" type="text" value="{vendor_name}"  readonly="readonly">
                                                                                
<xsl:attribute name="onMouseover">
                                                                                
        <xsl:text>window.status='</xsl:text>
                                                                                
                <xsl:value-of select="statustext"/>

====================================================
Index: property/templates/default/alarm.xsl
diff -u property/templates/default/alarm.xsl:1.1 
property/templates/default/alarm.xsl:1.2
--- property/templates/default/alarm.xsl:1.1    Wed Jul 21 19:00:12 2004
+++ property/templates/default/alarm.xsl        Thu Jan 13 16:52:48 2005
@@ -53,6 +53,8 @@
        <xsl:template match="table_header">
                <xsl:variable name="sort_alarm_id" select="sort_alarm_id"/>
                <xsl:variable name="sort_next_run" select="sort_next_run"/>
+               <xsl:variable name="sort_method" select="sort_method"/>
+               <xsl:variable name="sort_user" select="sort_user"/>
                        <tr class="th">
                                <td width="10%" align="right">
                                        <a href="{$sort_alarm_id}" 
class="th_text"><xsl:value-of select="lang_alarm_id"/></a>
@@ -63,8 +65,8 @@
                                <td width="10%" align="center">
                                        <xsl:value-of select="lang_times"/>
                                </td>
-                               <td width="10%" align="center">
-                                       <xsl:value-of select="lang_method"/>
+                               <td width="10%">
+                                       <a href="{$sort_method}" 
class="th_text"><xsl:value-of select="lang_method"/></a>
                                </td>
                                <td width="40%" align="center">
                                        <xsl:value-of select="lang_data"/>
@@ -72,8 +74,8 @@
                                <td width="5%" align="center">
                                        <xsl:value-of select="lang_enabled"/>
                                </td>
-                               <td width="10%" align="center">
-                                       <xsl:value-of select="lang_user"/>
+                               <td width="10%">
+                                       <a href="{$sort_user}" 
class="th_text"><xsl:value-of select="lang_user"/></a>
                                </td>
                                <td width="5%" align="center">
                                        <xsl:value-of select="lang_select"/>
@@ -210,13 +212,13 @@
                                </xsl:when>
                        </xsl:choose>
                        <xsl:choose>
-                               <xsl:when test="value_owner_id!=''">
+                               <xsl:when test="value_async_id!=''">
                                        <tr >
                                                <td width="25%" align="left">
-                                                       <xsl:value-of 
select="lang_owner_id"/>
+                                                       <xsl:value-of 
select="lang_async_id"/>
                                                </td>
                                                <td width="75%" align="left">
-                                                       <xsl:value-of 
select="value_owner_id"/>
+                                                       <xsl:value-of 
select="value_async_id"/>
                                                </td>
                                        </tr>
                                </xsl:when>
@@ -229,7 +231,7 @@

                                <td align="left">
                                        <xsl:variable 
name="lang_method_statustext"><xsl:value-of 
select="lang_method_statustext"/></xsl:variable>
-                                       <select name="method_id" class="forms" 
onMouseover="window.status='{$lang_method_statustext}'; return true;" 
onMouseout="window.status='';return true;">
+                                       <select name="values[method_id]" 
class="forms" onMouseover="window.status='{$lang_method_statustext}'; return 
true;" onMouseout="window.status='';return true;">
                                                <option value=""><xsl:value-of 
select="lang_no_method"/></option>
                                                        <xsl:apply-templates 
select="method_list"/>
                                        </select>

====================================================
Index: property/templates/default/agreement.xsl
diff -u property/templates/default/agreement.xsl:1.1 
property/templates/default/agreement.xsl:1.2
--- property/templates/default/agreement.xsl:1.1        Fri Aug 20 15:15:23 2004
+++ property/templates/default/agreement.xsl    Thu Jan 13 16:52:48 2005
@@ -879,6 +879,9 @@
                                                </td>
                                                <td align="left">
                                                        <xsl:value-of 
select="value_id"/>
+                                                       <xsl:text> [</xsl:text>
+                                                       <xsl:value-of 
select="value_num"/>
+                                                       <xsl:text>] </xsl:text>
                                                </td>
                                        </tr>
                                </xsl:when>

====================================================
Index: property/templates/default/actor.xsl
diff -u property/templates/default/actor.xsl:1.2 
property/templates/default/actor.xsl:1.3
--- property/templates/default/actor.xsl:1.2    Wed Jun  2 19:09:33 2004
+++ property/templates/default/actor.xsl        Thu Jan 13 16:52:48 2005
@@ -172,18 +172,29 @@
                                        </tr>
                                </xsl:when>
                        </xsl:choose>
-                       <xsl:choose>
-                               <xsl:when test="value_actor_id!=''">
-                                       <tr >
-                                               <td align="left">
-                                                       <xsl:value-of 
select="lang_actor_id"/>
-                                               </td>
+                       <tr >
+                               <td align="left">
+                                       <xsl:value-of select="lang_actor_id"/>
+                               </td>
+                               <xsl:choose>
+                                       <xsl:when test="value_actor_id!=''">
                                                <td align="left">
                                                        <xsl:value-of 
select="value_actor_id"/>
                                                </td>
-                                       </tr>
-                               </xsl:when>
-                       </xsl:choose>
+                                       </xsl:when>
+                                       <xsl:otherwise>
+                                       <td align="left">
+                                               <input type="text" size = "15" 
name="values[new_actor_id]" onMouseout="window.status='';return true;">
+                                                       <xsl:attribute 
name="onMouseover">
+                                                               
<xsl:text>window.status='</xsl:text>
+                                                                       
<xsl:value-of select="lang_id_statustext"/>
+                                                               <xsl:text>'; 
return true;</xsl:text>
+                                                       </xsl:attribute>
+                                               </input>
+                                       </td>
+                                       </xsl:otherwise>
+                               </xsl:choose>
+                       </tr>

                        <tr >
                                <td align="left">
@@ -254,6 +265,14 @@

        <xsl:template match="view">
                <table cellpadding="2" cellspacing="2" width="79%" 
align="center">
+                       <tr >
+                               <td align="left">
+                                       <xsl:value-of select="lang_actor_id"/>
+                               </td>
+                               <td align="left">
+                                       <xsl:value-of select="value_actor_id"/>
+                               </td>
+                       </tr>
                        <tr class="row_off">
                                <td width="19%">
                                        <xsl:value-of 
select="lang_time_created"/>

====================================================
Index: property/templates/default/admin_entity.xsl
diff -u property/templates/default/admin_entity.xsl:1.2 
property/templates/default/admin_entity.xsl:1.3
--- property/templates/default/admin_entity.xsl:1.2     Wed Jun  2 19:09:35 2004
+++ property/templates/default/admin_entity.xsl Thu Jan 13 16:52:48 2005
@@ -714,6 +714,37 @@
                                        </tr>
                                </xsl:when>
                        </xsl:choose>
+                       <xsl:choose>
+                               <xsl:when test="lang_start_project != ''">
+                                       <tr>
+                                               <td>
+                                                       <xsl:value-of 
select="lang_start_project"/>
+                                               </td>
+                                               <td>
+                                                       <xsl:choose>
+                                                                       
<xsl:when test="value_start_project = 1">
+                                                                               
<input type="checkbox" name="values[start_project]" value="1" checked="checked" 
onMouseout="window.status='';return true;">
+                                                                               
        <xsl:attribute name="onMouseover">
+                                                                               
                <xsl:text>window.status='</xsl:text>
+                                                                               
                        <xsl:value-of select="lang_start_project_statustext"/>
+                                                                               
                <xsl:text>'; return true;</xsl:text>
+                                                                               
        </xsl:attribute>
+                                                                               
</input>
+                                                                       
</xsl:when>
+                                                                       
<xsl:otherwise>
+                                                                               
<input type="checkbox" name="values[start_project]" value="1" 
onMouseout="window.status='';return true;">
+                                                                               
        <xsl:attribute name="onMouseover">
+                                                                               
                <xsl:text>window.status='</xsl:text>
+                                                                               
                        <xsl:value-of select="lang_start_project_statustext"/>
+                                                                               
                <xsl:text>'; return true;</xsl:text>
+                                                                               
        </xsl:attribute>
+                                                                               
</input>
+                                                                       
</xsl:otherwise>
+                                                       </xsl:choose>
+                                               </td>
+                                       </tr>
+                               </xsl:when>
+                       </xsl:choose>

                        <xsl:choose>
                                <xsl:when test="lang_location_level != ''">

====================================================
Index: property/templates/default/b_account.xsl
diff -u property/templates/default/b_account.xsl:1.3 
property/templates/default/b_account.xsl:1.4
--- property/templates/default/b_account.xsl:1.3        Thu Aug 12 18:56:23 2004
+++ property/templates/default/b_account.xsl    Thu Jan 13 16:52:48 2005
@@ -12,7 +12,7 @@
        </xsl:template>

        <xsl:template match="list">
-
+               <xsl:call-template name="menu"/>
                <table width="100%" cellpadding="2" cellspacing="2" 
align="center">
                        <tr>
                                <td align="right">
@@ -79,12 +79,20 @@
                                        <xsl:value-of select="first"/>
                                </td>
                                <td align="center">
-                                       <xsl:variable 
name="link_edit"><xsl:value-of select="link_edit"/></xsl:variable>
-                                       <a href="{$link_edit}" 
onMouseover="window.status='{$lang_edit_b_accounttext}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="text_edit"/></a>
+                                       <xsl:choose>
+                                               <xsl:when test="link_edit !=''">
+                                                       <xsl:variable 
name="link_edit"><xsl:value-of select="link_edit"/></xsl:variable>
+                                                       <a href="{$link_edit}" 
onMouseover="window.status='{$lang_edit_b_accounttext}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="text_edit"/></a>
+                                               </xsl:when>
+                                       </xsl:choose>
                                </td>
                                <td align="center">
-                                       <xsl:variable 
name="link_delete"><xsl:value-of select="link_delete"/></xsl:variable>
-                                       <a href="{$link_delete}" 
onMouseover="window.status='{$lang_delete_b_accounttext}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="text_delete"/></a>
+                                       <xsl:choose>
+                                               <xsl:when test="link_delete 
!=''">
+                                                       <xsl:variable 
name="link_delete"><xsl:value-of select="link_delete"/></xsl:variable>
+                                                       <a 
href="{$link_delete}" 
onMouseover="window.status='{$lang_delete_b_accounttext}';return true;" 
onMouseout="window.status='';return true;"><xsl:value-of 
select="text_delete"/></a>
+                                               </xsl:when>
+                                       </xsl:choose>
                                </td>
                        </tr>
        </xsl:template>
@@ -104,7 +112,7 @@
                                                </input>
                                        </form>
                                </td>
-                               <td height="50">
+       <!--                    <td height="50">
                                        <xsl:variable 
name="done_action"><xsl:value-of select="done_action"/></xsl:variable>
                                        <xsl:variable 
name="lang_done"><xsl:value-of select="lang_done"/></xsl:variable>
                                        <form method="post" 
action="{$done_action}">
@@ -117,6 +125,7 @@
                                                </input>
                                        </form>
                                </td>
+       -->
                        </tr>
        </xsl:template>


====================================================
Index: property/templates/default/document.xsl
diff -u property/templates/default/document.xsl:1.2 
property/templates/default/document.xsl:1.3
--- property/templates/default/document.xsl:1.2 Wed Jun  2 19:09:47 2004
+++ property/templates/default/document.xsl     Thu Jan 13 16:52:48 2005
@@ -23,6 +23,9 @@
                <xsl:call-template name="menu"/>
                <table width="100%"  cellpadding="2" cellspacing="2" 
align="center">
                        <tr>
+                               <td align="left">
+                                       <xsl:call-template 
name="doc_type_filter"/>
+                               </td>
                                <xsl:choose>
                                        <xsl:when test="cat_list!=''">
                                                <td align="left">
@@ -59,6 +62,39 @@
        </xsl:template>


+       <xsl:template name="doc_type_filter">
+               <xsl:variable name="select_name"><xsl:value-of 
select="select_name"/></xsl:variable>
+               <xsl:variable name="lang_submit"><xsl:value-of 
select="lang_submit"/></xsl:variable>
+               <form method="post" action="{select_action}">
+                       <select name="doc_type" onChange="this.form.submit();" 
onMouseout="window.status='';return true;">
+                               <xsl:attribute name="onMouseover">
+                                       <xsl:text>window.status='</xsl:text>
+                                               <xsl:value-of 
select="lang_doc_type_statustext"/>
+                                       <xsl:text>'; return true;</xsl:text>
+                               </xsl:attribute>
+                               <option value=""><xsl:value-of 
select="lang_no_doc_type"/></option>
+                                       <xsl:apply-templates select="doc_type"/>
+                       </select>
+                       <noscript>
+                               <xsl:text> </xsl:text>
+                               <input type="submit" name="submit" 
value="{$lang_submit}"/>
+                       </noscript>
+               </form>
+       </xsl:template>
+
+
+       <xsl:template match="doc_type">
+       <xsl:variable name="id"><xsl:value-of select="cat_id"/></xsl:variable>
+               <xsl:choose>
+                       <xsl:when test="selected">
+                               <option value="{$id}" 
selected="selected"><xsl:value-of disable-output-escaping="yes" 
select="name"/></option>
+                       </xsl:when>
+                       <xsl:otherwise>
+                               <option value="{$id}"><xsl:value-of 
disable-output-escaping="yes" select="name"/></option>
+                       </xsl:otherwise>
+               </xsl:choose>
+       </xsl:template>
+
        <xsl:template name="cat_filter2">
                <xsl:variable name="select_name"><xsl:value-of 
select="select_name"/></xsl:variable>
                <xsl:variable name="lang_submit"><xsl:value-of 
select="lang_submit"/></xsl:variable>
@@ -79,6 +115,7 @@
                </form>
        </xsl:template>

+
        <xsl:template match="cat_list">
        <xsl:variable name="id"><xsl:value-of select="id"/></xsl:variable>
                <xsl:choose>

====================================================
Index: property/templates/default/values.xsl
diff -u property/templates/default/values.xsl:1.2 
property/templates/default/values.xsl:1.3
--- property/templates/default/values.xsl:1.2   Wed Jun  2 19:10:49 2004
+++ property/templates/default/values.xsl       Thu Jan 13 16:52:48 2005
@@ -43,7 +43,7 @@
                                                                <xsl:choose>
                                                                        
<xsl:when test="//lookup!=''">
                                                                                
<xsl:if test="position() = last()">
-                                                                               
        <td class="small_text" valign="center">
+                                                                               
<!--    <td class="small_text" valign="center"> -->
                                                                                
                <xsl:variable name="select_action"><xsl:value-of 
select="lookup_action"/></xsl:variable>
                                                                                
                <xsl:variable name="lang_select"><xsl:value-of 
select="//lang_select"/></xsl:variable>
                                                                                
                <form method="post" action="{$select_action}">
@@ -55,8 +55,7 @@
                                                                                
                        </xsl:attribute>
                                                                                
                </input>
                                                                                
                </form>
-                                                                               
        </td>
-
+                                                                               
<!--    </td> -->
                                                                                
</xsl:if>
                                                                        
</xsl:when>
                                                                </xsl:choose>

====================================================
Index: property/templates/default/wo_hour.xsl
diff -u property/templates/default/wo_hour.xsl:1.2 
property/templates/default/wo_hour.xsl:1.3
--- property/templates/default/wo_hour.xsl:1.2  Wed Jun  2 19:10:49 2004
+++ property/templates/default/wo_hour.xsl      Thu Jan 13 16:52:48 2005
@@ -486,6 +486,19 @@
                        </tr>
                        <xsl:call-template name="location_view"/>

+                       <xsl:choose>
+                               <xsl:when test="contact_phone !=''">
+                                       <tr>
+                                               <td class="th_text"  
align="left">
+                                                       <xsl:value-of 
select="lang_contact_phone"/>
+                                               </td>
+                                               <td  align="left">
+                                                       <xsl:value-of 
select="contact_phone"/>
+                                               </td>
+                                       </tr>
+                               </xsl:when>
+                       </xsl:choose>
+
                        <tr>
                                <td class="th_text"  align="left">
                                        <xsl:value-of select="lang_title"/>

====================================================
Index: property/templates/default/workorder.xsl
diff -u property/templates/default/workorder.xsl:1.2 
property/templates/default/workorder.xsl:1.3
--- property/templates/default/workorder.xsl:1.2        Wed Jun  2 19:10:49 2004
+++ property/templates/default/workorder.xsl    Thu Jan 13 16:52:48 2005
@@ -313,6 +313,20 @@
                                </xsl:when>
                                <xsl:otherwise>
                                        <xsl:call-template 
name="location_view"/>
+
+                                       <xsl:choose>
+                                               <xsl:when test="contact_phone 
!=''">
+                                                       <tr>
+                                                               <td 
class="th_text"  align="left">
+                                                                       
<xsl:value-of select="lang_contact_phone"/>
+                                                               </td>
+                                                               <td  
align="left">
+                                                                       
<xsl:value-of select="contact_phone"/>
+                                                               </td>
+                                                       </tr>
+                                               </xsl:when>
+                                       </xsl:choose>
+
                                </xsl:otherwise>
                        </xsl:choose>
                        <tr>
@@ -836,6 +850,20 @@
                                </xsl:for-each>
                        </tr>
                        <xsl:call-template name="location_view"/>
+
+                       <xsl:choose>
+                               <xsl:when test="contact_phone !=''">
+                                       <tr>
+                                               <td class="th_text"  
align="left">
+                                                       <xsl:value-of 
select="lang_contact_phone"/>
+                                               </td>
+                                               <td  align="left">
+                                                       <xsl:value-of 
select="contact_phone"/>
+                                               </td>
+                                       </tr>
+                               </xsl:when>
+                       </xsl:choose>
+
                        <tr>
                                <td valign="top">
                                        <xsl:value-of 
select="lang_power_meter"/>

====================================================
Index: property/templates/default/project.xsl
diff -u property/templates/default/project.xsl:1.5 
property/templates/default/project.xsl:1.6
--- property/templates/default/project.xsl:1.5  Tue Sep 14 20:24:14 2004
+++ property/templates/default/project.xsl      Thu Jan 13 16:52:48 2005
@@ -792,7 +792,21 @@
                                        </xsl:choose>
                                </xsl:for-each>
                        </tr>
-                               <xsl:call-template name="location_view"/>
+                       <xsl:call-template name="location_view"/>
+
+                       <xsl:choose>
+                               <xsl:when test="contact_phone !=''">
+                                       <tr>
+                                               <td class="th_text"  
align="left">
+                                                       <xsl:value-of 
select="lang_contact_phone"/>
+                                               </td>
+                                               <td  align="left">
+                                                       <xsl:value-of 
select="contact_phone"/>
+                                               </td>
+                                       </tr>
+                               </xsl:when>
+                       </xsl:choose>
+
                        <tr>
                                <td valign="top">
                                        <xsl:value-of 
select="lang_power_meter"/>

====================================================
Index: property/templates/default/location_view.xsl
diff -u property/templates/default/location_view.xsl:1.2 
property/templates/default/location_view.xsl:1.3
--- property/templates/default/location_view.xsl:1.2    Wed Jun  2 19:10:20 2004
+++ property/templates/default/location_view.xsl        Thu Jan 13 16:52:48 2005
@@ -6,25 +6,37 @@

        <xsl:template match="location_data">
                        <xsl:for-each select="location" >
-                               <tr>
-                                       <td class="th_text" width="{with}" 
align="left">
-                                               <xsl:value-of select="name"/>
-                                       </td>
-                                       <td align="left">
-                                               <xsl:choose>
-                                                       <xsl:when 
test="input_type !='hidden'">
-                                                               <xsl:value-of 
select="value"/>
-                                                       </xsl:when>
-                                               </xsl:choose>
-                                               <xsl:for-each select="extra" >
-                                                       <xsl:choose>
-                                                               <xsl:when 
test="input_type !='hidden'">
-                                                                       
<xsl:text> </xsl:text>
-                                                                       
<xsl:value-of select="value"/>
-                                                               </xsl:when>
-                                                       </xsl:choose>
-                                               </xsl:for-each>
-                                       </td>
-                               </tr>
+                               <xsl:choose>
+                                       <xsl:when test="value !=''">
+                                               <tr>
+                                                       <td class="th_text" 
width="{with}" align="left">
+                                                               <xsl:value-of 
select="name"/>
+                                                       </td>
+                                                       <td align="left">
+                                                               <xsl:choose>
+                                                                       
<xsl:when test="input_type !='hidden'">
+                                                                               
<xsl:choose>
+                                                                               
        <xsl:when test="query_link !=''">
+                                                                               
                <xsl:variable name="query_link" select="query_link"/>
+                                                                               
                <a href="{$query_link}" class="th_text"><xsl:value-of 
select="value"/></a>
+                                                                               
        </xsl:when>
+                                                                               
        <xsl:otherwise>
+                                                                               
                <xsl:value-of select="value"/>
+                                                                               
        </xsl:otherwise>
+                                                                               
</xsl:choose>
+                                                                       
</xsl:when>
+                                                               </xsl:choose>
+                                                               <xsl:for-each 
select="extra" >
+                                                                       
<xsl:choose>
+                                                                               
<xsl:when test="input_type !='hidden'">
+                                                                               
        <xsl:text> </xsl:text>
+                                                                               
        <xsl:value-of select="value"/>
+                                                                               
</xsl:when>
+                                                                       
</xsl:choose>
+                                                               </xsl:for-each>
+                                                       </td>
+                                               </tr>
+                                       </xsl:when>
+                               </xsl:choose>
                        </xsl:for-each>
        </xsl:template>

====================================================
Index: property/templates/default/entity.xsl
diff -u property/templates/default/entity.xsl:1.2 
property/templates/default/entity.xsl:1.3
--- property/templates/default/entity.xsl:1.2   Wed Jun  2 19:09:57 2004
+++ property/templates/default/entity.xsl       Thu Jan 13 16:52:48 2005
@@ -378,6 +378,26 @@
                                        </form>
                                </td>
                        </tr>
+
+                       <xsl:choose>
+                               <xsl:when test="start_project!=''">
+                                       <tr>
+                                               <td valign="top">
+                                                       <xsl:variable 
name="project_link"><xsl:value-of select="project_link"/></xsl:variable>
+                                                       <form method="post" 
action="{$project_link}">
+                                                       <xsl:variable 
name="lang_start_project"><xsl:value-of 
select="lang_start_project"/></xsl:variable>
+                                                       <input type="submit" 
name="location" value="{$lang_start_project}" 
onMouseout="window.status='';return true;">
+                                                               <xsl:attribute 
name="onMouseover">
+                                                                       
<xsl:text>window.status='</xsl:text>
+                                                                               
<xsl:value-of select="lang_start_project_statustext"/>
+                                                                       
<xsl:text>'; return true;</xsl:text>
+                                                               </xsl:attribute>
+                                                       </input>
+                                                       </form>
+                                               </td>
+                                       </tr>
+                               </xsl:when>
+                       </xsl:choose>
                </table>
                </div>


====================================================
Index: property/templates/default/invoice.xsl
diff -u property/templates/default/invoice.xsl:1.7 
property/templates/default/invoice.xsl:1.8
--- property/templates/default/invoice.xsl:1.7  Wed Sep  1 21:00:18 2004
+++ property/templates/default/invoice.xsl      Thu Jan 13 16:52:48 2005
@@ -1687,7 +1687,7 @@
                                        </input>
                                </td>
                                <td>
-                                       <input type="text" name="vendor_id" 
value="{value_vendor_id}" size="4"  onMouseout="window.status='';return true;">
+                                       <input type="text" name="vendor_id" 
value="{value_vendor_id}" size="6"  onMouseout="window.status='';return true;">
                                                <xsl:attribute 
name="onMouseover">
                                                        
<xsl:text>window.status='</xsl:text>
                                                                <xsl:value-of 
select="lang_vendor_statustext"/>

====================================================
Index: property/templates/default/abook_view.xsl
diff -u property/templates/default/abook_view.xsl:1.2 
property/templates/default/abook_view.xsl:1.3
--- property/templates/default/abook_view.xsl:1.2       Wed Jun  2 19:09:33 2004
+++ property/templates/default/abook_view.xsl   Thu Jan 13 16:52:48 2005
@@ -12,7 +12,7 @@
                                <td>
                                        <xsl:value-of select="value_abid"/>
                                        <xsl:text> - </xsl:text>
-                                       <xsl:value-of select="value_org_name"/>
+                                       <xsl:value-of 
select="value_contact_name"/>
                                </td>
                        </tr>
        </xsl:template>

====================================================
Index: property/templates/default/abook_form.xsl
diff -u property/templates/default/abook_form.xsl:1.2 
property/templates/default/abook_form.xsl:1.3
--- property/templates/default/abook_form.xsl:1.2       Wed Jun  2 19:09:31 2004
+++ property/templates/default/abook_form.xsl   Thu Jan 13 16:52:48 2005
@@ -29,7 +29,7 @@
                                                        <xsl:text>'; return 
true;</xsl:text>
                                                </xsl:attribute>
                                        </input>
-                               <input  size="30" type="text" 
name="vendor_name" value="{value_org_name}"  onClick="abook_lookup();" 
readonly="readonly">
+                               <input  size="30" type="text" 
name="vendor_name" value="{value_contact_name}"  onClick="abook_lookup();" 
readonly="readonly">
                                        <xsl:attribute name="onMouseover">
                                                        
<xsl:text>window.status='</xsl:text>
                                                                <xsl:value-of 
select="lang_select_contact_help"/>






reply via email to

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