|
| From: | sigurdne |
| Subject: | [Phpgroupware-cvs] property/templates/base project.xsl, 1.2 request.xsl, 1.3 |
| Date: | Fri, 25 Feb 2005 14:19:00 +0100 |
Update of property/templates/base
Modified Files:
Branch: MAIN
project.xsl lines: +92 -76
request.xsl lines: +3 -2
Log Message:
no message
====================================================
Index: property/templates/base/project.xsl
diff -u property/templates/base/project.xsl:1.1
property/templates/base/project.xsl:1.2
--- property/templates/base/project.xsl:1.1 Mon Jan 17 10:03:18 2005
+++ property/templates/base/project.xsl Fri Feb 25 13:19:54 2005
@@ -142,59 +142,92 @@
<xsl:value-of
select="value_project_id"/>
</td>
</tr>
- <tr>
- <td valign="top">
- <a
href="{link_select_request}"
onMouseover="window.status='{lang_select_request_statustext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="lang_select_request"/></a>
- </td>
- <td>
- <xsl:choose>
- <xsl:when
test="value_request_id!=''">
+
+
+ <xsl:choose>
+ <xsl:when
test="selected_request =''">
+ <tr>
+ <td
valign="top">
+ <a
href="{link_select_request}"
onMouseover="window.status='{lang_select_request_statustext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="lang_select_request"/></a>
+ </td>
+ </tr>
+ </xsl:when>
+ </xsl:choose>
+
+ <xsl:for-each select="value_origin" >
+ <xsl:variable
name="link_origin_type"><xsl:value-of select="link"/></xsl:variable>
+ <tr>
+ <td valign ="top">
+ <xsl:choose>
+
<xsl:when test="type ='request'">
+
<a href="{//link_select_request}"
onMouseover="window.status='{//lang_select_request_statustext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of
select="//lang_select_request"/></a>
+
</xsl:when>
+
<xsl:otherwise>
+
<xsl:value-of select="descr"/>
+
</xsl:otherwise>
+ </xsl:choose>
+ </td>
+ <td>
<table>
- <xsl:for-each
select="value_request_id" >
- <tr>
- <td
class="th_text" align="left" >
-
<xsl:variable name="link_request"><xsl:value-of
select="//link_request"/>&id=<xsl:value-of select="id"/></xsl:variable>
-
<a href="{$link_request}"
onMouseover="window.status='{//lang_request_statustext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of select="id"/></a>
-
<xsl:text> </xsl:text>
-
<input type="checkbox" name="values[delete_request][]" value="{id}"
onMouseout="window.status='';return true;">
-
<xsl:attribute name="onMouseover">
-
<xsl:text>window.status='</xsl:text>
-
<xsl:value-of
select="//lang_delete_request_statustext"/>
-
<xsl:text>'; return true;</xsl:text>
-
</xsl:attribute>
-
</input>
- </td>
- </tr>
- </xsl:for-each>
- </table>
- </xsl:when>
- </xsl:choose>
- </td>
- </tr>
- </xsl:when>
- </xsl:choose>
- <xsl:choose>
- <xsl:when test="value_ticket_id!=''">
- <tr>
- <td>
- <xsl:value-of
select="lang_ticket"/>
- </td>
- <td class="th_text"
align="left">
- <xsl:for-each
select="value_ticket_id" >
-
<xsl:variable name="link_ticket"><xsl:value-of
select="//link_ticket"/>&id=<xsl:value-of select="id"/></xsl:variable>
- <a
href="{$link_ticket}"
onMouseover="window.status='{//lang_ticket_statustext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of select="id"/></a>
-
<xsl:text> </xsl:text>
+
+ <xsl:for-each
select="data">
+ <tr>
+
+ <td class="th_text"
align="left" >
+ <xsl:variable
name="link_request"><xsl:value-of
select="//link_request"/>&id=<xsl:value-of select="id"/></xsl:variable>
+ <a
href="{$link_origin_type}&id={id}"
onMouseover="window.status='{//lang_origin_statustext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of select="id"/></a>
+ <xsl:text>
</xsl:text>
+
+ <xsl:choose>
+
<xsl:when test="type ='request'">
+ <input
type="checkbox" name="values[delete_request][]" value="{id}"
onMouseout="window.status='';return true;">
+
<xsl:attribute name="onMouseover">
+
<xsl:text>window.status='</xsl:text>
+
<xsl:value-of select="//lang_delete_request_statustext"/>
+
<xsl:text>'; return true;</xsl:text>
+
</xsl:attribute>
+ </input>
+
</xsl:when>
+ </xsl:choose>
+ </td>
+ </tr>
</xsl:for-each>
- </td>
- </tr>
+ </table>
+ </td>
+ </tr>
+ </xsl:for-each>
</xsl:when>
+ <xsl:otherwise>
+ <xsl:for-each select="value_origin" >
+ <xsl:variable
name="link_origin_type"><xsl:value-of select="link"/></xsl:variable>
+ <tr>
+ <td valign ="top">
+ <xsl:value-of
select="descr"/>
+ </td>
+ <td>
+ <table>
+
<xsl:for-each select="data">
+
<tr>
+
<td class="th_text" align="left" >
+
<xsl:variable name="link_request"><xsl:value-of
select="//link_request"/>&id=<xsl:value-of select="id"/></xsl:variable>
+
<a href="{$link_origin_type}&id={id}"
onMouseover="window.status='{//lang_origin_statustext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of select="id"/></a>
+
<xsl:text> </xsl:text>
+
</td>
+
</tr>
+
</xsl:for-each>
+ </table>
+ </td>
+ </tr>
+ </xsl:for-each>
+ </xsl:otherwise>
</xsl:choose>
+
<tr>
<td valign="top">
<xsl:value-of select="lang_name"/>
</td>
<td>
- <input type="hidden"
name="values[origin]" value="{value_origin}"></input>
+ <input type="hidden"
name="values[origin]" value="{value_origin_type}"></input>
<input type="hidden"
name="values[origin_id]" value="{value_origin_id}"></input>
<input type="text" name="values[name]"
value="{value_name}" onMouseout="window.status='';return true;">
<xsl:attribute
name="onMouseover">
@@ -729,39 +762,22 @@
<xsl:value-of
select="value_project_id"/>
</td>
</tr>
- <xsl:choose>
- <xsl:when test="value_request_id!=''">
- <tr>
- <td>
- <xsl:value-of
select="lang_request"/>
- </td>
- <td class="th_text"
align="left">
- <xsl:for-each
select="value_request_id" >
-
<xsl:variable name="link_request"><xsl:value-of
select="//link_request"/>&id=<xsl:value-of select="id"/></xsl:variable>
- <a
href="{$link_request}"
onMouseover="window.status='{//lang_request_statustext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of select="id"/></a>
-
<xsl:text> </xsl:text>
- </xsl:for-each>
- </td>
- </tr>
- </xsl:when>
- </xsl:choose>
- <xsl:choose>
- <xsl:when test="value_ticket_id!=''">
- <tr>
- <td>
- <xsl:value-of
select="lang_ticket"/>
- </td>
- <td class="th_text"
align="left">
- <xsl:for-each
select="value_ticket_id" >
-
<xsl:variable name="link_ticket"><xsl:value-of
select="//link_ticket"/>&id=<xsl:value-of select="id"/></xsl:variable>
- <a
href="{$link_ticket}"
onMouseover="window.status='{//lang_ticket_statustext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of select="id"/></a>
-
<xsl:text> </xsl:text>
- </xsl:for-each>
- </td>
- </tr>
- </xsl:when>
- </xsl:choose>
+ <xsl:for-each select="value_origin" >
+ <xsl:variable
name="link_origin_type"><xsl:value-of select="link"/></xsl:variable>
+ <tr>
+ <td valign ="top">
+ <xsl:value-of select="descr"/>
+ </td>
+ <td class="th_text"
align="left" >
+ <xsl:for-each select="data">
+ <a
href="{$link_origin_type}&id={id}"
onMouseover="window.status='{//lang_origin_statustext}';return true;"
onMouseout="window.status='';return true;"><xsl:value-of select="id"/></a>
+ <xsl:text> </xsl:text>
+ </xsl:for-each>
+ </td>
+ </tr>
+ </xsl:for-each>
+
<tr>
<td valign="top">
<xsl:value-of select="lang_name"/>
====================================================
Index: property/templates/base/request.xsl
diff -u property/templates/base/request.xsl:1.2
property/templates/base/request.xsl:1.3
--- property/templates/base/request.xsl:1.2 Mon Jan 24 11:41:32 2005
+++ property/templates/base/request.xsl Fri Feb 25 13:19:54 2005
@@ -312,7 +312,8 @@
<xsl:variable
name="generate_project_action"><xsl:value-of
select="generate_project_action"/></xsl:variable>
<xsl:variable
name="lang_generate_project"><xsl:value-of
select="lang_generate_project"/></xsl:variable>
<form method="post"
action="{$generate_project_action}">
- <input type="hidden"
name="request_id" value="{value_request_id}"></input>
+ <input type="hidden"
name="origin" value="request"></input>
+ <input type="hidden"
name="origin_id" value="{value_request_id}"></input>
<input type="hidden"
name="location_code" value="{location_code}"></input>
<input type="hidden"
name="bypass" value="true"></input>
<input type="hidden"
name="descr" value="{value_descr}"></input>
| [Prev in Thread] | Current Thread | [Next in Thread] |