[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9716]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [9716] |
|
Date: |
Tue, 03 Jul 2012 12:18:54 +0000 |
Revision: 9716
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9716
Author: vator
Date: 2012-07-03 12:18:53 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------
Modified Paths:
--------------
trunk/controller/templates/base/check_list/add_check_list.xsl
trunk/controller/templates/base/check_list/edit_check_list.xsl
trunk/controller/templates/base/check_list/register_case.xsl
trunk/controller/templates/base/check_list/view_cases_for_check_list.xsl
trunk/controller/templates/base/check_list/view_control_info.xsl
Modified: trunk/controller/templates/base/check_list/add_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/add_check_list.xsl
2012-07-03 11:10:50 UTC (rev 9715)
+++ trunk/controller/templates/base/check_list/add_check_list.xsl
2012-07-03 12:18:53 UTC (rev 9716)
@@ -33,7 +33,14 @@
<h2><xsl:value-of
select="component_array/xml_short_desc"/></h2>
</xsl:when>
<xsl:otherwise>
- <h2>Bygg: <xsl:value-of
select="location_array/loc1_name"/></h2>
+ <xsl:choose>
+ <xsl:when test="location_level
= 1">
+ <h2>Eiendom:
<xsl:value-of select="location_array/loc1_name"/></h2>
+ </xsl:when>
+ <xsl:otherwise>
+ <h2>Bygg:
<xsl:value-of select="location_array/loc2_name"/></h2>
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:otherwise>
</xsl:choose>
</div>
Modified: trunk/controller/templates/base/check_list/edit_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/edit_check_list.xsl
2012-07-03 11:10:50 UTC (rev 9715)
+++ trunk/controller/templates/base/check_list/edit_check_list.xsl
2012-07-03 12:18:53 UTC (rev 9716)
@@ -42,7 +42,14 @@
<h2><xsl:value-of
select="component_array/xml_short_desc"/></h2>
</xsl:when>
<xsl:otherwise>
- <h2>Bygg: <xsl:value-of
select="location_array/loc1_name"/></h2>
+ <xsl:choose>
+ <xsl:when test="location_level
= 1">
+ <h2>Eiendom:
<xsl:value-of select="location_array/loc1_name"/></h2>
+ </xsl:when>
+ <xsl:otherwise>
+ <h2>Bygg:
<xsl:value-of select="location_array/loc2_name"/></h2>
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:otherwise>
</xsl:choose>
</div>
Modified: trunk/controller/templates/base/check_list/register_case.xsl
===================================================================
--- trunk/controller/templates/base/check_list/register_case.xsl
2012-07-03 11:10:50 UTC (rev 9715)
+++ trunk/controller/templates/base/check_list/register_case.xsl
2012-07-03 12:18:53 UTC (rev 9716)
@@ -10,7 +10,21 @@
<h2><xsl:value-of
select="component_array/xml_short_desc"/></h2>
</xsl:when>
<xsl:otherwise>
- <h2>Bygg: <xsl:value-of
select="location_array/loc1_name"/></h2>
+ <xsl:choose>
+ <xsl:when test="type = 'component'">
+ <h2><xsl:value-of
select="component_array/xml_short_desc"/></h2>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:choose>
+ <xsl:when test="location_level
= 1">
+ <h2>Eiendom:
<xsl:value-of select="location_array/loc1_name"/></h2>
+ </xsl:when>
+ <xsl:otherwise>
+ <h2>Bygg:
<xsl:value-of select="location_array/loc2_name"/></h2>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:otherwise>
+ </xsl:choose>
</xsl:otherwise>
</xsl:choose>
Modified:
trunk/controller/templates/base/check_list/view_cases_for_check_list.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_cases_for_check_list.xsl
2012-07-03 11:10:50 UTC (rev 9715)
+++ trunk/controller/templates/base/check_list/view_cases_for_check_list.xsl
2012-07-03 12:18:53 UTC (rev 9716)
@@ -61,7 +61,21 @@
</script>
<h1>Utførelse av kontroll: <xsl:value-of
select="control/title"/></h1>
- <h2>Sjekkliste for: <xsl:value-of
select="location_array/loc1_name"/></h2>
+ <xsl:choose>
+ <xsl:when test="type = 'component'">
+ <h2><xsl:value-of
select="component_array/xml_short_desc"/></h2>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:choose>
+ <xsl:when test="location_level
= 1">
+ <h2>Eiendom:
<xsl:value-of select="location_array/loc1_name"/></h2>
+ </xsl:when>
+ <xsl:otherwise>
+ <h2>Bygg:
<xsl:value-of select="location_array/loc2_name"/></h2>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:otherwise>
+ </xsl:choose>
<xsl:call-template name="check_list_tab_menu">
<xsl:with-param
name="active_tab">view_cases</xsl:with-param>
Modified: trunk/controller/templates/base/check_list/view_control_info.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_control_info.xsl
2012-07-03 11:10:50 UTC (rev 9715)
+++ trunk/controller/templates/base/check_list/view_control_info.xsl
2012-07-03 12:18:53 UTC (rev 9716)
@@ -68,7 +68,21 @@
</script>
<h1>Utførelse av kontroll: <xsl:value-of select="control/title"/></h1>
- <h2>Sjekkliste for: <xsl:value-of
select="location_array/loc1_name"/></h2>
+ <xsl:choose>
+ <xsl:when test="type = 'component'">
+ <h2><xsl:value-of
select="component_array/xml_short_desc"/></h2>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:choose>
+ <xsl:when test="location_level
= 1">
+ <h2>Eiendom:
<xsl:value-of select="location_array/loc1_name"/></h2>
+ </xsl:when>
+ <xsl:otherwise>
+ <h2>Bygg:
<xsl:value-of select="location_array/loc2_name"/></h2>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:otherwise>
+ </xsl:choose>
<xsl:call-template name="check_list_tab_menu">
<xsl:with-param
name="active_tab">view_control_info</xsl:with-param>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9716],
Torstein <=