[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [9723]
|
From: |
Torstein |
|
Subject: |
[Fmsystem-commits] [9723] |
|
Date: |
Tue, 03 Jul 2012 13:10:53 +0000 |
Revision: 9723
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9723
Author: vator
Date: 2012-07-03 13:10:50 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------
Modified Paths:
--------------
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/register_case.xsl
===================================================================
--- trunk/controller/templates/base/check_list/register_case.xsl
2012-07-03 12:48:00 UTC (rev 9722)
+++ trunk/controller/templates/base/check_list/register_case.xsl
2012-07-03 13:10:50 UTC (rev 9723)
@@ -4,12 +4,9 @@
<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>
+ <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>
@@ -25,10 +22,51 @@
</xsl:choose>
</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>
- <xsl:call-template name="check_list_tab_menu" />
+ <!-- ================== CHECKLIST TAB MENU
===================== -->
+ <xsl:call-template name="check_list_tab_menu" />
+ </div>
+
+
<div id="view_cases">
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 12:48:00 UTC (rev 9722)
+++ trunk/controller/templates/base/check_list/view_cases_for_check_list.xsl
2012-07-03 13:10:50 UTC (rev 9723)
@@ -60,8 +60,10 @@
}
</script>
- <h1>Utførelse av kontroll: <xsl:value-of
select="control/title"/></h1>
- <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>
@@ -76,11 +78,52 @@
</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">
<xsl:with-param
name="active_tab">view_cases</xsl:with-param>
</xsl:call-template>
-
+ </div>
+
<a id="view_open_cases">
<xsl:attribute name="href">
<xsl:text>index.php?menuaction=controller.uicheck_list.view_open_cases</xsl:text>
Modified: trunk/controller/templates/base/check_list/view_control_info.xsl
===================================================================
--- trunk/controller/templates/base/check_list/view_control_info.xsl
2012-07-03 12:48:00 UTC (rev 9722)
+++ trunk/controller/templates/base/check_list/view_control_info.xsl
2012-07-03 13:10:50 UTC (rev 9723)
@@ -67,8 +67,10 @@
</script>
- <h1>Utførelse av kontroll: <xsl:value-of select="control/title"/></h1>
- <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>
@@ -83,10 +85,51 @@
</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>
- </xsl:call-template>
+ </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">
+ <xsl:with-param
name="active_tab">view_control_info</xsl:with-param>
+ </xsl:call-template>
+ </div>
<div class="tab_menu">
<a id="view_control_details" class="active">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [9723],
Torstein <=