[Fmsystem-commits] [9721]

[Torstein]

Revision: 9721
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9721
Author:   vator
Date:     2012-07-03 12:45:15 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------


Modified Paths:
--------------
    trunk/controller/templates/base/case/create_case_message.xsl
    trunk/controller/templates/base/case/view_case_message.xsl

Modified: trunk/controller/templates/base/case/create_case_message.xsl
===================================================================
--- trunk/controller/templates/base/case/create_case_message.xsl        
2012-07-03 12:45:03 UTC (rev 9720)
+++ trunk/controller/templates/base/case/create_case_message.xsl        
2012-07-03 12:45:15 UTC (rev 9721)
@@ -43,7 +43,7 @@
                                            <xsl:attribute name="value">
                                                        <xsl:choose>
                                                          <xsl:when test="type 
= 'component'">
-                                                                 <xsl:value-of 
select="location_array/location_code"/>
+                                                                 <xsl:value-of 
select="component_array/location_code"/>
                                                                </xsl:when>
                                                                <xsl:otherwise>
                                                                  <xsl:value-of 
select="location_array/location_code"/>

Modified: trunk/controller/templates/base/case/view_case_message.xsl
===================================================================
--- trunk/controller/templates/base/case/view_case_message.xsl  2012-07-03 
12:45:03 UTC (rev 9720)
+++ trunk/controller/templates/base/case/view_case_message.xsl  2012-07-03 
12:45:15 UTC (rev 9721)
@@ -5,7 +5,21 @@
 <div id="main_content" class="medium">
        
        <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" />
        
@@ -21,12 +35,7 @@
                                </xsl:attribute>
                        Vis melding
                        </a>
-               
-                       <!-- ===  BYGG  === -->
-                       <div class="row">
-                               <label>Bygg:</label><span><xsl:value-of 
select="location_array/loc1_name"/></span>
-                       </div>
-                       
+                               
                    <!-- === TITLE === -->
                    <div class="row">                           
                                <label>Tittel på 
melding:</label><span><xsl:value-of select="message_ticket/subject"/></span>