[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9724]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [9724] |
|
Date: |
Tue, 03 Jul 2012 13:11:12 +0000 |
Revision: 9724
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9724
Author: vator
Date: 2012-07-03 13:11:10 +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 13:10:50 UTC (rev 9723)
+++ trunk/controller/templates/base/case/create_case_message.xsl
2012-07-03 13:11:10 UTC (rev 9724)
@@ -4,24 +4,67 @@
<div id="main_content" class="medium">
- <h1>Utførelse av kontroll: <xsl:value-of
select="control/title"/></h1>
- <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>
+ <div id="check-list-heading">
+ <div class="box-1">
+ <h1>Kontroll: <xsl:value-of
select="control/title"/></h1>
+ <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>
+ </div>
+ <div class="box-2 select-box">
+ <a>
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:text>
+ <xsl:text>&year=</xsl:text>
+ <xsl:value-of select="current_year"/>
+ <xsl:text>&location_code=</xsl:text>
+ <xsl:choose>
+ <xsl:when test="type = 'component'">
+ <xsl:value-of
select="building_location_code"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="location_array/location_code"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
+ Kontrolplan for bygg/eiendom (år)
+ </a>
+ <a class="last">
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
+ <xsl:text>&year=</xsl:text>
+ <xsl:value-of select="current_year"/>
+ <xsl:text>&month=</xsl:text>
+ <xsl:value-of
select="current_month_nr"/>
+ <xsl:text>&location_code=</xsl:text>
+ <xsl:choose>
+ <xsl:when test="type = 'component'">
+ <xsl:value-of
select="building_location_code"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="location_array/location_code"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
+ Kontrolplan for bygg/eiendom (måned)
+ </a>
+ </div>
+ <!-- ================== CHECKLIST TAB MENU
===================== -->
<xsl:call-template name="check_list_tab_menu" />
+ </div>
<!-- ======================= INFO ABOUT MESSAGE
========================= -->
<h3 class="box_header ext">Registrer melding</h3>
Modified: trunk/controller/templates/base/case/view_case_message.xsl
===================================================================
--- trunk/controller/templates/base/case/view_case_message.xsl 2012-07-03
13:10:50 UTC (rev 9723)
+++ trunk/controller/templates/base/case/view_case_message.xsl 2012-07-03
13:11:10 UTC (rev 9724)
@@ -4,25 +4,68 @@
<div id="main_content" class="medium">
- <h1>Utførelse av kontroll: <xsl:value-of select="control/title"/></h1>
- <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>
+ <div id="check-list-heading">
+ <div class="box-1">
+ <h1>Kontroll: <xsl:value-of
select="control/title"/></h1>
+ <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>
+ </div>
+ <div class="box-2 select-box">
+ <a>
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_year</xsl:text>
+ <xsl:text>&year=</xsl:text>
+ <xsl:value-of select="current_year"/>
+ <xsl:text>&location_code=</xsl:text>
+ <xsl:choose>
+ <xsl:when test="type = 'component'">
+ <xsl:value-of
select="building_location_code"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="location_array/location_code"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
+ Kontrolplan for bygg/eiendom (år)
+ </a>
+ <a class="last">
+ <xsl:attribute name="href">
+
<xsl:text>index.php?menuaction=controller.uicalendar.view_calendar_for_month</xsl:text>
+ <xsl:text>&year=</xsl:text>
+ <xsl:value-of select="current_year"/>
+ <xsl:text>&month=</xsl:text>
+ <xsl:value-of
select="current_month_nr"/>
+ <xsl:text>&location_code=</xsl:text>
+ <xsl:choose>
+ <xsl:when test="type = 'component'">
+ <xsl:value-of
select="building_location_code"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of
select="location_array/location_code"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:attribute>
+ Kontrolplan for bygg/eiendom (måned)
+ </a>
+ </div>
+
+ <!-- ================== CHECKLIST TAB MENU
===================== -->
+ <xsl:call-template name="check_list_tab_menu" />
+ </div>
- <xsl:call-template name="check_list_tab_menu" />
-
<!-- ======================= INFO ABOUT MESSAGE
========================= -->
<h3 class="box_header ext">Melding registrert</h3>
<div id="caseMessage" class="box ext">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9724],
Torstein <=